101captain
2022-08-01 0a4aee700a60c4b28248f3d1a7f4f91376b68492
Merge branch 'haucheng_panzhihua' into shuangzheng2
143个文件已添加
519个文件已修改
30722 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java 246 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java 279 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 428 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java 9858 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java 605 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchApi.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchAuditApi.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComFmsApi.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingWestApi.java 1044 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborWestApi.java 218 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHousesApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/pom.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/CommonApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/KaphtchaApi.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/KaptchaConfig.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActDpcApi.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseTypeApi.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchApi.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchAuditApi.java 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunitySwitchApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborWestApi.java 367 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRegisterApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoHandlerMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseDAO.java 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseTypeDAO.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseWestDAO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyWestDAO.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentWestDAO.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleFabulousWestDAO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicWestMapper.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleWestDAO.java 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditDAO.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditScheduleDAO.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchDAO.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectSignDAO.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComStreetDAO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsMerchantDAO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidCheckRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidDangerMember.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidMember.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidUpdateRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityCode.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActDpc.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoEvaluate.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoHandler.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterprise.java 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterpriseType.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActReserveDangerArea.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatch.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAudit.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAuditSchedule.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSign.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseApply.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseBase.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseDonates.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComAreaTownCommunity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbCheckUnit.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbServiceTeam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComProperty.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPropertyWorker.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsCoupon.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsProduct.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseContractConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseFile.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseLabel.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePayingOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePreOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRefundOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRegister.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseReturnOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysTemplateConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActEvaluateDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPrizeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynTypeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoRewardDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserChangeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageDO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseWestDO.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyWestDO.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentWestDO.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousWestDO.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicWestDO.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireAnswerContentDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireUserAnswerDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveAnswerContentDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveOperationRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubSelectionDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletChangeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideMaterialDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCultPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessAreaDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessIntroduceDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtCategoryDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDisabilityPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDrugPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthElderliesDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthHistoryRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthStatisticsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComExServicemanDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowIncomePeopleCopyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPeopleDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCarDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCityDO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngDistrictDO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationCommunityTagsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngProvinceDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealAssetsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealCompanyDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDistrictDO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngUserTagDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesEnrollRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesInoculationRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerOrgTeam.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerServiceType.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerSkill.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsHouseDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthHistoryRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthPensionerDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthStatisticsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSentencePopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOperLogDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderPayDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopSysConfDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComStreetDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordReportDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwSafetyWorkRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientConsultationStatisticsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductCategoryDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductSpecificationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientServiceCategoryDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientViewStatisticsDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthFeedbackDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/SysConfDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDpcService.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoHandlerService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseService.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseTypeService.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseWestService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentReplyWestService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentWestService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleFabulousWestService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicWestService.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleWestService.java 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditScheduleService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditService.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchService.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java 183 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseServiceImpl.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseTypeServiceImpl.java 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseWestServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentReplyWestServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentWestServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleFabulousWestServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicWestServiceImpl.java 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java 929 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditScheduleServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditServiceImpl.java 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchServiceImpl.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerOrgTeamServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerServiceTypeServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussOptionUserDOMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseMapper.xml 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseTypeMapper.xml 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicWestDOMapper.xml 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleWestDOMapper.xml 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditMapper.xml 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditScheduleMapper.xml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchMapper.xml 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectSignMapper.xml 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerOrgTeamDao.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerServiceTypeDao.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerSkillDao.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComStreetMapper.xml 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeRelationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventSpecialCrowdRecordDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java 188 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngWestApi.java 779 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberWestDAO.java 184 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynUserDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberWestDO.java 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberWestService.java 249 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java 698 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java 1058 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml 647 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarmSetting.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyHelp.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysAppConfigApi.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysAppConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysTemplateConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngStructHouseDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/EventGridMemberBuildingRelationDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserAgreementDO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserInputDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/pom.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/KaphtchaApi.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/AuthConfig.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/KaptchaConfig.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/MyAESUtil.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
New file
@@ -0,0 +1,123 @@
package com.panzhihua.applets.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@Api(tags = {"人大代表相关"})
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;
    @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return communityService.detailDpc(id);
    }
    @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
    @PostMapping("/page")
    public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfo)) {
            pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        } else if (isNull(pageDpcDTO.getCommunityId())) {
            return R.fail("未指定社区");
        }
        return communityService.pageDpc(pageDpcDTO);
    }
    @ApiOperation(value = "获取人大代表反馈记录", response = ComActEasyPhotoFeedbackVO.class)
    @ApiImplicitParam(name = "id", value = "随手拍id", required = true)
    @GetMapping("/feedback")
    public R getFeedbackList(@RequestParam("id") Long id) {
        return communityService.getFeedbackList(id);
    }
    @ApiOperation(value = "人大代表反馈随手拍")
    @PostMapping("/feedback")
    public R addFeedback(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Integer isDpcMember = loginUserInfo.getIsDpcMember();
        if (isNull(isDpcMember) || !isDpcMember.equals(1)) {
            return R.fail("暂无权限");
        }
        Long userId = loginUserInfo.getUserId();
        Integer type = comActEasyPhotoVO.getType();
        if (null == type || type != 3) {
            return R.fail("操作类型错误");
        }
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        comActEasyPhotoVO.setUserId(userId);
        R r = communityService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailEasyPhoto(id, userId);
            if (R.isOk(r1)) {
                ComActEasyPhotoVO comActEasyPhotoVO1 =
                    JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), ComActEasyPhotoVO.class);
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(comActEasyPhotoVO1.getSponsorId());
                sysUserNoticeVO.setType(2);
                sysUserNoticeVO.setBusinessType(4);
                sysUserNoticeVO.setBusinessTime(comActEasyPhotoVO1.getExamineAt());
                sysUserNoticeVO.setBusinessId(id);
                sysUserNoticeVO.setStatus(0);
                if (type.intValue() == 3) {
                    sysUserNoticeVO.setTitle("随手拍有反馈");
                    sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO.getHandleResult());
                    sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜,将变成现在更好看的样子找到更好的自己……");
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增随手拍有反馈通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
            }
        }
        return r;
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.applets.api;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@Api(tags = {"社区企业管理"})
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation("获取社区企业详情")
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return communityService.detailEnterprise(id);
    }
    @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfo)) {
            pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
        } else if (isNull(pageEnterpriseDTO.getCommunityId())) {
            return R.fail("未指定社区");
        }
        return communityService.pageEnterprise(pageEnterpriseDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComActVO;
@@ -13,6 +14,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 * @author zzj
@@ -31,18 +35,23 @@
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
    @ApiOperation(value = "社会组织列表", response = ComActSocialOrgVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getCommunityId()!=null){
           R r=communityService.detailCommunity(this.getCommunityId());
           if(R.isOk(r)){
              ComActVO comActVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            if(comActVO!=null){
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        R r = communityService.detailCommunity(commonPage.getCommunityId());
        if (R.isOk(r)) {
            ComActVO comActVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            if (comActVO != null) {
                commonPage.setStreetId(comActVO.getStreetId());
            }
           }
        }
        commonPage.setCommunityId(null);
        return this.communityService.comActSocialOrgSelectAll(commonPage);
    }
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java
New file
@@ -0,0 +1,72 @@
package com.panzhihua.applets.api;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActSocialOrgHatchAuditApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请相关
 * @author: hans
 * @date: 2022/04/18 14:14
 */
@Slf4j
@Api(tags = {"社会组织孵化申请"})
@RestController
@RequestMapping("/comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "新增孵化申请")
    @PostMapping("/add")
    public R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        hatchAuditDTO.setUserId(this.getUserId());
        return communityService.addHatchAudit(hatchAuditDTO);
    }
    @ApiOperation(value = "查看孵化申请审核进度", response = SocialOrgHatchAuditVO.class)
    @GetMapping("/schedule")
    public R getHatchAuditSchedule() {
        return communityService.getHatchAuditSchedule(this.getUserId());
    }
    @ApiOperation(value = "修改孵化申请")
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody @Validated(PutGroup.class) SocialOrgHatchAuditDTO hatchAuditDTO) {
        return communityService.updateHatchAudit(hatchAuditDTO);
    }
    @ApiOperation(value = "获取孵化流程配置", response = String.class)
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return communityService.getHatchAuditProcess();
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java
@@ -2,16 +2,24 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 * 三社联动项目表(ComActSocialProject)表控制层
@@ -39,8 +47,14 @@
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        commonPage.setParamId2(0);
        commonPage.setIsPublicity(1);
        return communityService.selectAllComActSocialProject(commonPage);
    }
@@ -53,7 +67,12 @@
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        Long userId = null;
        if (nonNull(userInfo)) {
            userId = userInfo.getUserId();
        }
        return communityService.getAppletComActSocialProject(id, userId);
    }
    /**
     * 根据项目id分页获取关联项目
@@ -100,4 +119,16 @@
        return communityService.deleteComActSocialProject(id);
    }
    @ApiOperation(value = "项目公开报名")
    @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
    @GetMapping("/sign")
    public R signProject(@RequestParam("projectId") Long projectId) {
        return communityService.signProject(projectId, this.getUserId());
    }
    @ApiOperation(value = "分页查询项目报名列表", response = ComActSocialOrgVO.class)
    @PostMapping("signList")
    public R pageProjectSignList(@RequestBody @Valid PageProjectSignListDTO pageProjectSignListDTO) {
        return communityService.pageProjectSignList(pageProjectSignListDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
@@ -3,6 +3,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -13,6 +14,9 @@
import javax.annotation.Resource;
import java.util.List;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
@@ -40,7 +44,12 @@
    @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        return communityService.selectAllComActSocialProjectPublicity(commonPage);
    }
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -21,6 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 *
@@ -75,7 +79,12 @@
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            pageComActSocialWorkerDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(pageComActSocialWorkerDTO.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }
@@ -124,7 +133,7 @@
    }
//    @GetMapping("/getTemplate")
    //    @GetMapping("/getTemplate")
//    @ApiOperation("获取模板")
//    public R getTemplate(){
//        return R.ok(comactsocialworkerUrl);
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
@@ -78,7 +78,7 @@
     */
    @ApiOperation("详情接口")
    @GetMapping("/{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.propertyService.comPropertyRepairSelectOne(id);
    }
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -16,6 +16,7 @@
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.MimeTypeUtils;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -42,6 +43,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -156,6 +159,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
@@ -170,6 +174,7 @@
    @PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String uuid=UUID.randomUUID().toString().replaceAll("-", "");
            String name = uuid  + "."+ extension;
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -7,6 +7,8 @@
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;
@@ -14,6 +16,7 @@
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;
@@ -46,6 +49,8 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.isNull;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区服务
@@ -59,6 +64,8 @@
public class CommunityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @Resource
@@ -84,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);
    }
@@ -343,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")
@@ -359,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) {
@@ -383,4 +407,28 @@
    }
    @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);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
@@ -27,13 +27,13 @@
    @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
    @GetMapping("/list/noToken")
    public R list() {
        return communityService.communitySwitchList(this.getAreaCode());
        return communityService.communitySwitchList(this.getAppId());
    }
    @ApiOperation(value = "根据名字搜索社区", response = CommunitySwitchAllAppletsVO.class)
    @GetMapping("/search/noToken")
    public R search(@RequestParam(value = "name") String name) {
        return communityService.communitySwitchSearchList(name,this.getAreaCode());
        return communityService.communitySwitchSearchList(name,this.getAppId());
    }
    @ApiOperation(value = "根据距离搜索社区", response = CommunitySwitchAllAppletsVO.class)
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -65,6 +65,7 @@
        if (loginUserInfo != null) {
            comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
            comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
            comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
        }
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }
@@ -115,6 +116,13 @@
    @PostMapping("/editEasyPhotoHandler")
    public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
    }
    @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
    @ApiImplicitParam(name = "id", value = "处理id", required = true)
    @GetMapping("/easyPhotoHandler")
    public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
        return this.communityService.detailEasyPhotoHandler(id);
    }
    @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@@ -277,7 +285,7 @@
    @GetMapping("agreement")
    @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
        return userService.agreement(type,this.getAppId());
    }
    @ApiOperation("发布留言")
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -90,7 +90,7 @@
            unionid = "无";
        }
        userService.addOrUpdate(openid, sessionKey, unionid);
        return tokenService.loginApplets(openid);
        return tokenService.loginApplets(openid,this.getAppId());
    }
    @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
@@ -130,7 +130,7 @@
        R r1 = userService.getUserInfoByUnionId(unionId);
        if (R.isOk(r1)) {
            LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
            return tokenService.loginApplets(loginUserInfoVO.getOpenid());
            return tokenService.loginApplets(loginUserInfoVO.getOpenid(),this.getAppId());
        }
        return r1;
    }
@@ -166,7 +166,7 @@
            unionid = "无";
        }
        userService.addOrUpdate(openid, sessionKey, unionid);
        return tokenService.loginApplets(openid);
        return tokenService.loginApplets(openid,this.getAppId());
    }
    @ApiOperation(value = "维护用户基本信息(昵称、性别、头像)")
@@ -300,7 +300,7 @@
    @GetMapping("useragreement")
    public R userAgreement() {
        int type = 1;
        return userService.userAgreement(type);
        return userService.userAgreement(type,this.getAppId());
    }
    @ApiOperation("uu洗车登录")
    @PostMapping("uuLogin")
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.isNull;
/**
 * @auther lyq
 * @create 2021-04-14 15:02:49
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
New file
@@ -0,0 +1,246 @@
package com.panzhihua.applets.api;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.constants.NeighborCircleConstants;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.neighbor.*;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-14 15:02:49
 * @describe 邻里圈模块API
 */
@Slf4j
@RestController
@RequestMapping("/neighborWest/")
@Api(tags = {"邻里圈服务"})
public class NeighborWestApi extends BaseController {
    @Resource
    private CommunityWestService communityWestService;
    @Resource
    private CheckService checkService;
    @ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class)
    @PostMapping("pageApp")
    public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
        }
        return communityWestService.pageNeighborByApp(neighborCircleAppDTO);
    }
    @ApiOperation(value = "用户发布邻里圈审核")
    @PostMapping("addNeighborByApp")
    public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        Long userId = loginUser.getUserId();
        Long communityId = loginUser.getCommunityId();
        if(userId == null){
            return R.fail("请重新登录");
        }
        addNeighborCircleAppDTO.setUserId(userId);
        if (StringUtils.isNotEmpty(loginUser.getPhone())) {
            addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
        }
        if(communityId != null){
            addNeighborCircleAppDTO.setCommunityId(communityId);
        }
        //查询社区自动审核是否开着
        String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
        R isOk = communityWestService.getSysConfValue(key + communityId,communityId);
        if(R.isOk(isOk)){
            if(isOk.getData() != null){
                String value = isOk.getData().toString();
                if(value.equals("1")){
                    addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
                    String msg = addNeighborCircleAppDTO.getReleaseContent();
                    if (checkService.checkMessage(msg)) {
                        addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
                    }else{
                        addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
                    }
                }else{
                    addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
                }
            }else{
                communityWestService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","1");
                addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
            }
        }else{
            addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
        }
        return communityWestService.addNeighborByApp(addNeighborCircleAppDTO);
    }
    @ApiOperation(value = "查询邻里圈详情", response = ComActNeighborCircleDetailAppVO.class)
    @PostMapping("detail")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
        }
        // Long userId = this.getLoginUserInfo().getUserId();
        // if(userId == null){
        // return R.fail("请先登录");
        // }
        // neighborCircleAppDTO.setUserId(userId);
        return communityWestService.neighborDetailByApp(neighborCircleAppDTO);
    }
    @ApiOperation(value = "分页查询用户邻里圈审核列表", response = ComActNeighborCircleAppVO.class)
    @PostMapping("user/page")
    public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        neighborCircleAppDTO.setUserId(userId);
        return communityWestService.neighborExamineByApp(neighborCircleAppDTO);
    }
    @ApiOperation(value = "邻里圈点赞")
    @PostMapping("fabulous")
    public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        fabulousAppDTO.setUserId(userId);
        return communityWestService.neighborFabulousByApp(fabulousAppDTO);
    }
    @ApiOperation(value = "邻里圈转发")
    @PostMapping("forward")
    public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            forwardAppDTO.setUserId(loginUserInfo.getUserId());
        }
        // Long userId = this.getLoginUserInfo().getUserId();
        // if(userId == null){
        // return R.fail("请先登录");
        // }
        // forwardAppDTO.setUserId(userId);
        return communityWestService.neighborForwardByApp(forwardAppDTO);
    }
    @ApiOperation(value = "邻里圈评论")
    @PostMapping("comment")
    public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        commentAppDTO.setUserId(userId);
        return communityWestService.neighborCommentByApp(commentAppDTO);
    }
    @ApiOperation(value = "邻里圈回复")
    @PostMapping("reply")
    public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        replyAppDTO.setUserId(userId);
        return communityWestService.neighborReplyByApp(replyAppDTO);
    }
    @ApiOperation(value = "邻里圈取消点赞")
    @PostMapping("cancel/fabulous")
    public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        fabulousAppDTO.setUserId(userId);
        return communityWestService.neighborFabulousCancelByApp(fabulousAppDTO);
    }
    @ApiOperation(value = "邻里圈添加浏览记录")
    @PostMapping("add/browse")
    public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if (userId == null) {
            return R.fail("请先登录");
        }
        addBrowseAppDTO.setUserId(userId);
        return communityWestService.neighborAddBrowseByApp(addBrowseAppDTO);
    }
    @ApiOperation(value = "分页查询评论下所有回复", response = ComActNeighborCommentReplyAppVO.class)
    @PostMapping("comment/reply")
    public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
        }
        // Long userId = this.getLoginUserInfo().getUserId();
        // if(userId == null){
        // return R.fail("请先登录");
        // }
        // commentReplyAppDTO.setUserId(userId);
        return communityWestService.neighborCommentReplyByApp(commentReplyAppDTO);
    }
    @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
    @GetMapping("topic/list")
    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
            ,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero
            ,@RequestParam(value = "name",defaultValue = "",required = false) String name) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            communityId = loginUserInfo.getCommunityId();
        }
        if(isZero == null){
            isZero = 2;
        }
        return communityWestService.getNeighborTopicByApp(communityId,isZero,name);
    }
    @ApiOperation(value = "用户新增邻里圈话题")
    @PostMapping("topic/add")
    public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo == null){
            return R.fail(401,"请先登录");
        }
        circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
        circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityWestService.addNeighborTopicByApp(circleTopicAppDTO);
    }
    @ApiOperation(value = "用户删除邻里圈")
    @PostMapping("delete")
    public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo == null){
            return R.fail(401,"请先登录");
        }
        circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
        circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityWestService.deleteNeighborByApp(circleTopicAppDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +48,8 @@
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private UserService userService;
    @Resource
    private CheckService checkService;
@@ -73,7 +76,7 @@
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setStatus(2);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }
    @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@@ -110,7 +113,7 @@
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        R r = partyBuildingWestService.infoYnamic(id);
        if (R.isOk(r)) {
            if (ObjectUtils.isEmpty(id) || 0 == id) {
                return R.fail("主键id不能为空");
@@ -128,7 +131,7 @@
                comPbDynUserVO.setCreateAt(new Date());
                comPbDynUserVO.setDynId(id);
                comPbDynUserVO.setUserId(userId);
                R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
                R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
                if (R.isOk(r1)) {
                    partyBuildingComPbDynVO.setIsAdd(1);
                } else {
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
New file
@@ -0,0 +1,279 @@
package com.panzhihua.applets.api;
import java.util.Date;
import javax.annotation.Resource;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党群服务
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-02 16:19
 **/
@Slf4j
@RestController
@RequestMapping("/partybuildingWest/")
@Api(tags = {"党群服务"})
public class PartyBuildingWestApi extends BaseController {
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private UserService userService;
    @Resource
    private CheckService checkService;
    @Resource
    private ComPbCheckUnitFeign pbCheckUnitFeign;
    public static void main(String[] args) {
        Date date = new Date();
        String dateFormat = String.format("%tF %tT ", date, date);
        System.out.println(dateFormat);
    }
    @ApiOperation(value = "分页党建动态/政策文件", response = PartyBuildingComPbDynVO.class)
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            partyBuildingComPbDynVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        Integer type = partyBuildingComPbDynVO.getType();
        if (ObjectUtils.isEmpty(type)) {
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setStatus(2);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }
    @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            partyBuildingActivityVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        // Long communityId = this.getCommunityId();
        // partyBuildingActivityVO.setCommunityId(communityId);
        Integer status = partyBuildingActivityVO.getStatus();
        if (null != status && status.intValue() == 4) {
            partyBuildingActivityVO.setIsAppliets(1);
        }
        return partyBuildingWestService.pageActivity(partyBuildingActivityVO);
    }
    // @ApiOperation(value = "增加阅读记录")
    // @PostMapping("adddynuser")
    // public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
    // Long id = partyBuildingComPbDynVO.getId();
    // if (ObjectUtils.isEmpty(id)||0==id) {
    // return R.fail("主键id不能为空");
    // }
    // Long userId = this.getUserId();
    // ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
    // comPbDynUserVO.setCreateAt(new Date());
    // comPbDynUserVO.setDynId(id);
    // comPbDynUserVO.setUserId(userId);
    // return partyBuildingService.addDynUser(comPbDynUserVO);
    // }
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingWestService.infoYnamic(id);
        if (R.isOk(r)) {
            if (ObjectUtils.isEmpty(id) || 0 == id) {
                return R.fail("主键id不能为空");
            }
            Long userId = null;
            LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
            if (loginUserInfo != null) {
                userId = loginUserInfo.getUserId();
            }
            PartyBuildingComPbDynVO partyBuildingComPbDynVO =
                JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
            if (userId != null) {
                ComPbDynUserVO comPbDynUserVO = new ComPbDynUserVO();
                comPbDynUserVO.setCreateAt(new Date());
                comPbDynUserVO.setDynId(id);
                comPbDynUserVO.setUserId(userId);
                R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
                if (R.isOk(r1)) {
                    partyBuildingComPbDynVO.setIsAdd(1);
                } else {
                    partyBuildingComPbDynVO.setIsAdd(0);
                }
            } else {
                partyBuildingComPbDynVO.setIsAdd(0);
            }
            return R.ok(partyBuildingComPbDynVO);
        }
        return r;
    }
    @ApiOperation(value = "分页党委查询", response = PartyCommitteeVO.class)
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        // Long communityId =this.getCommunityId();
        // partyCommitteeVO.setCommunityId(communityId);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        return partyBuildingWestService.pagePartyCommittee(partyCommitteeVO);
    }
    @ApiOperation(value = "活动详情", response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        return partyBuildingWestService.activityinfo(id, userId);
    }
    @ApiOperation(value = "党员活动人员参入列表", response = PartyBuildingMemberVO.class)
    @GetMapping("listpartybuildingmember")
    public R listPartyBuildingMember(@RequestParam("id") Long id) {
        return partyBuildingWestService.listPartyBuildingMember(id);
    }
    @ApiOperation(value = "报名、取消报名党员活动")
    @PutMapping("activitysignup")
    public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
        Long userId = this.getUserId();
        activitySignUpDTO.setUserId(userId);
        Long id = activitySignUpDTO.getId();
        R r = partyBuildingWestService.putActivitySignUp(activitySignUpDTO);
        if (R.isOk(r) && activitySignUpDTO.getType().intValue() == 1) {
            R r2 = partyBuildingWestService.activityinfo(id, userId);
            PartyBuildingActivityVO partyBuildingActivityVO =
                JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(1);
            sysUserNoticeVO.setTitle("报名成功");
            sysUserNoticeVO.setBusinessType(2);
            sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
            Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
            sysUserNoticeVO
                .setBusinessContent(String.format("活动将于 %tF %tT  开始,请按时参加", activityTimeBegin, activityTimeBegin));
            sysUserNoticeVO.setBusinessId(id);
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(2);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }
        return r;
    }
    @ApiOperation(value = "创建党员活动")
    @PostMapping("activityinfo")
    public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
        // 微信内容审核
        String msg = comPbActivityDTO.getRichText();
        if (!checkService.checkMessage(msg)) {
            return R.fail("内容违规");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        comPbActivityDTO.setCreateBy(userId);
        comPbActivityDTO.setCommunityId(communityId);
        Date date = new Date();
        comPbActivityDTO.setReleaseTime(date);
        Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
        Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
        boolean before = activityTimeEnd.before(activityTimeBegin);
        if (before) {
            return R.fail("活动结束时间不能早于开始时间");
        }
        // 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
        int status = 2;
        Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin();
        Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd();
        if (enrollTimeEnd.before(enrollTimeBegin)) {
            return R.fail("报名结束时间不能早于报名开始时间");
        }
        if (enrollTimeBegin.before(date)) {
            status = 3;
        }
        comPbActivityDTO.setStatus(status);
        return partyBuildingWestService.addActivityApplets(comPbActivityDTO);
    }
    @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            pageComPbServiceTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        }
        // pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        return partyBuildingWestService.pageServiceTeam(pageComPbServiceTeamDTO);
    }
    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
        // Long communityId = this.getCommunityId();
        // log.info("社区所有党组织社区id【{}】", communityId);
        // if(communityId != null){
        // comListPartyDTO.setCommunityId(communityId);
        // }
        return partyBuildingWestService.listPartyOrganizationByApp(comListPartyDTO);
    }
    @OperLog(operModul = "党员管理", operType = 2)
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        if(partyBuildingMemberVO.getIsPb()!=null){
            Long id = partyBuildingMemberVO.getId();
            if(partyBuildingMemberVO.getIsPb()==1){
                if (null == id || 0 == id) {
                    return partyBuildingWestService.addPartyBuildingMember(partyBuildingMemberVO);
                }
                return partyBuildingWestService.updatePartyBuildingMember(partyBuildingMemberVO);
            }
            return partyBuildingWestService.deleteprepartybuildingmember(id);
        }
        return R.fail();
    }
    @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
    @PostMapping("/comPbCheckUnit/list")
    public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        if(comPbCheckUnit.getCommunityId() == null){
            comPbCheckUnit.setCommunityId(this.getCommunityId());
        }
        return pbCheckUnitFeign.queryByList(comPbCheckUnit);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -7,9 +7,11 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import org.apache.commons.lang.StringUtils;
@@ -530,4 +532,11 @@
        userArchivesVO.setUserId(userId);
        return userService.updateUserArchives(userArchivesVO);
    }
    @ApiOperation(value = "分页查询用户报名的项目")
    @PostMapping("project")
    public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
        pageProjectDTO.setUserId(this.getUserId());
        return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletRequest;
import com.panzhihua.applets_backstage.config.MinioUtil;
import com.panzhihua.common.utlis.MimeTypeUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
@@ -29,6 +30,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -156,6 +159,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java
@@ -79,7 +79,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, this.getAreaCode());
    }
    @ApiOperation(value = "特殊群体/分页查询标签列表", response = ComMngTagVO.class)
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -64,7 +64,7 @@
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setCommunityId(communityId);
            administratorsUserVO.setStatus(comActVO1.getState() + 1);
            administratorsUserVO.setRoleId(999999999L);
            administratorsUserVO.setRoleId(999999999l);
            administratorsUserVO.setUserId(this.getUserId());
            R r1 = userService.addUserBackstage(administratorsUserVO);
            if (!R.isOk(r1)) {
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.panzhihua.common.utlis.MimeTypeUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
@@ -59,6 +60,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
 * @description: 社区便民服务商家接口
@@ -224,6 +227,7 @@
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
@@ -240,6 +244,7 @@
    @PostMapping(value = "/upload/files", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java
@@ -39,7 +39,7 @@
            return R.fail("账户密码不能为空");
        }
        log.info("登录用户信息【{}】", loginBody);
        return tokenService.loginAppletsBackStage(account, password);
        return tokenService.loginAppletsBackStage(account, password,this.getAppId());
    }
    @ApiOperation(value = "登出")
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java
@@ -79,7 +79,7 @@
    @ApiOperation("重置密码")
    @GetMapping("/unlock")
    public R unlock(@RequestParam("type")Integer type,@RequestParam("isReset")Integer isReset,@RequestParam("account")String account){
        stringRedisTemplate.delete("LOGIN_FAIL_"+account+"_"+type);
        stringRedisTemplate.delete("LOGIN_FAIL_"+account+"_"+type+"_"+this.getAppId());
        if(isReset==1){
            userService.resetPasswordAccount(type,account);
        }
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +30,7 @@
 **/
@RestController
@RequestMapping("/")
public class LoginApi {
public class LoginApi extends BaseController {
    @Resource
    private LoginService loginService;
@@ -42,8 +43,8 @@
     */
    @OperLog(operModul = "小程序登录")
    @PostMapping("/loginApplets")
    public R loginApplets(@RequestParam("openId") String openId) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId);
    public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
        return R.ok(loginReturnVO);
    }
@@ -72,8 +73,8 @@
     */
    @OperLog(operModul = "运营后台登录")
    @PostMapping("/loginAppletsBackStage")
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -94,7 +95,7 @@
        if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
            return R.fail("账户密码不能为空");
        }
        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password);
        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password,this.getAppId());
        return R.ok(loginReturnVO);
    }
@@ -109,8 +110,8 @@
     */
    @OperLog(operModul = "社区后台登录")
    @PostMapping("/loginCommunityBackage")
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -161,8 +162,8 @@
     */
    @OperLog(operModul = "商家后台登录")
    @PostMapping("/loginShopBackStage")
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -177,8 +178,8 @@
     */
    @OperLog(operModul = "网格综治app登录")
    @PostMapping("/loginGridApp")
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -193,8 +194,8 @@
     */
    @OperLog(operModul = "网格综治后台登录")
    @PostMapping("/loginGridBackstage")
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -206,8 +207,8 @@
     */
    @OperLog(operModul = "城管后台登录")
    @PostMapping("/loginCgBackage")
    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -219,8 +220,8 @@
     */
    @OperLog(operModul = "一键报警APP登录 ")
    @PostMapping("/loginAlarmApp")
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -235,8 +236,8 @@
     */
    @OperLog(operModul = "便民服务商家后台登录 ")
    @PostMapping("/loginMerchantBackStage")
    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -248,8 +249,8 @@
     */
    @OperLog(operModul = "西区大屏登录")
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,appid);
        return R.ok(loginReturnVO);
    }
@@ -264,8 +265,8 @@
     */
    @PostMapping("/loginMcsUser")
    @OperLog(operModul = "微商业街用户登录")
    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid);
        return R.ok(loginReturnVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -18,7 +18,7 @@
     *            微信标识
     * @return jwt
     */
    LoginReturnVO loginApplets(String openId);
    LoginReturnVO loginApplets(String openId,String appId);
    /**
     * 小程序用户登出
@@ -37,7 +37,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginAppletsBackStage(String account, String password);
    LoginReturnVO loginAppletsBackStage(String account, String password,String appid);
    /**
     * 社区后台登录
@@ -48,7 +48,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginCommunityBackage(String account, String password);
    LoginReturnVO loginCommunityBackage(String account, String password,String appid);
    /**
     * 商家后台登录
@@ -59,7 +59,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginShopBackStage(String account, String password);
    LoginReturnVO loginShopBackStage(String account, String password,String appid);
    /**
     * 大数据统计平台(区、街道、社区三层登陆接口)
@@ -72,7 +72,7 @@
     * @return 登录结果
     * @date 2021-5-13 10:56
     */
    LoginReturnVO loginBigDataBackStage(String account, String password);
    LoginReturnVO loginBigDataBackStage(String account, String password,String appid);
    /**
     * 网格综治APP登录
@@ -83,7 +83,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnsVO loginGridApp(String account, String password);
    LoginReturnsVO loginGridApp(String account, String password,String appid);
    /**
     * 网格综治后台登录
@@ -94,7 +94,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginGridBackstage(String account, String password);
    LoginReturnVO loginGridBackstage(String account, String password,String appid);
    /**
     * 城管后台登录
@@ -102,7 +102,7 @@
     * @param password  密码
     * @return  登录结果
     */
    LoginReturnVO loginCgBackage(String account, String password);
    LoginReturnVO loginCgBackage(String account, String password,String appid);
    /**
     * 一键报警APP登录
@@ -113,7 +113,7 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnsVO loginAlarmApp(String account, String password);
    LoginReturnsVO loginAlarmApp(String account, String password,String appid);
    /**
     * 便民服务商家后台登录
@@ -121,7 +121,7 @@
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginMerchantBackStage(String account, String password);
    LoginReturnVO loginMerchantBackStage(String account, String password,String appid);
    /**
     * 西区大屏登录
@@ -129,7 +129,7 @@
     * @param password  密码
     * @return  登录结果
     */
    LoginReturnVO loginXQDP(String account, String password);
    LoginReturnVO loginXQDP(String account, String password,String appid);
    /**
     * 微商业街用户登录
@@ -137,5 +137,5 @@
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginMcsUser(String account, String password);
    LoginReturnVO loginMcsUser(String account, String password,String appid);
}
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -45,10 +45,10 @@
     * @return jwt
     */
    @Override
    public LoginReturnVO loginApplets(String openId) {
    public LoginReturnVO loginApplets(String openId,String appId) {
        Authentication authentication = null;
        authentication = authenticationManager
            .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1", UserConstants.PASSWORD));
            .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1"+"_"+appId, UserConstants.PASSWORD));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -81,10 +81,10 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginAppletsBackStage(String account, String password) {
    public LoginReturnVO loginAppletsBackStage(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -104,10 +104,10 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginCommunityBackage(String account, String password) {
    public LoginReturnVO loginCommunityBackage(String account, String password,String appId) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3"+"_"+appId, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -133,10 +133,10 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginShopBackStage(String account, String password) {
    public LoginReturnVO loginShopBackStage(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -158,10 +158,10 @@
     * @date 2021-5-13 10:56
     */
    @Override
    public LoginReturnVO loginBigDataBackStage(String account, String password) {
    public LoginReturnVO loginBigDataBackStage(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -181,10 +181,10 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnsVO loginGridApp(String account, String password) {
    public LoginReturnsVO loginGridApp(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -205,10 +205,10 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginGridBackstage(String account, String password) {
    public LoginReturnVO loginGridBackstage(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7", password));
            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -219,10 +219,10 @@
    }
    @Override
    public LoginReturnVO loginCgBackage(String account, String password){
    public LoginReturnVO loginCgBackage(String account, String password,String appid){
        Authentication authentication = null;
        authentication =
                authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9", password));
                authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -233,10 +233,10 @@
    }
    @Override
    public LoginReturnsVO loginAlarmApp(String account, String password) {
    public LoginReturnsVO loginAlarmApp(String account, String password,String appid) {
        Authentication authentication = null;
        authentication =
                authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password));
                authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -254,8 +254,8 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginMerchantBackStage(String account, String password) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10", password));
    public LoginReturnVO loginMerchantBackStage(String account, String password,String appid) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -272,8 +272,8 @@
     * @return  登录结果
     */
    @Override
    public LoginReturnVO loginXQDP(String account, String password){
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password));
    public LoginReturnVO loginXQDP(String account, String password,String appid){
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
@@ -290,8 +290,8 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginMcsUser(String account, String password) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11", password));
    public LoginReturnVO loginMcsUser(String account, String password,String appid) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -139,8 +139,11 @@
    }
    public String getAppId(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return "wx118de8a734d269f0";
        String appid = this.getRequest().getHeader("appid");
        if(StringUtils.isEmpty(appid)){
            return "wx0cef797390444b75";
        }
        return appid;
    }
    public String getAppSecret(){
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java
New file
@@ -0,0 +1,84 @@
package com.panzhihua.common.exceptions;
import com.panzhihua.common.utlis.MessageUtils;
import org.apache.commons.lang3.StringUtils;
/**
 * 基础异常
 *
 * @author
 */
public class BaseException extends RuntimeException {
    private static final long serialVersionUID = 1L;
    /**
     * 所属模块
     */
    private String module;
    /**
     * 错误码
     */
    private String code;
    /**
     * 错误码对应的参数
     */
    private Object[] args;
    /**
     * 错误消息
     */
    private String defaultMessage;
    public BaseException(String module, String code, Object[] args, String defaultMessage) {
        this.module = module;
        this.code = code;
        this.args = args;
        this.defaultMessage = defaultMessage;
    }
    public BaseException(String module, String code, Object[] args) {
        this(module, code, args, null);
    }
    public BaseException(String module, String defaultMessage) {
        this(module, null, null, defaultMessage);
    }
    public BaseException(String code, Object[] args) {
        this(null, code, args, null);
    }
    public BaseException(String defaultMessage) {
        this(null, null, null, defaultMessage);
    }
    @Override
    public String getMessage() {
        String message = null;
        if (!StringUtils.isEmpty(code)) {
            message = MessageUtils.message(code, args);
        }
        if (message == null) {
            message = defaultMessage;
        }
        return message;
    }
    public String getModule() {
        return module;
    }
    public String getCode() {
        return code;
    }
    public Object[] getArgs() {
        return args;
    }
    public String getDefaultMessage() {
        return defaultMessage;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java
New file
@@ -0,0 +1,18 @@
package com.panzhihua.common.exceptions;
/**
 * 文件信息异常类
 *
 * @author
 */
public class FileException extends BaseException
{
    private static final long serialVersionUID = 1L;
    public FileException(String code, Object[] args)
    {
        super("file", code, args, null);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.exceptions;
/**
 * 文件名称超长限制异常类
 *
 * @author ruoyi
 */
public class FileNameLengthLimitExceededException extends FileException
{
    private static final long serialVersionUID = 1L;
    public FileNameLengthLimitExceededException(int defaultFileNameLength)
    {
        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.exceptions;
/**
 * 文件名大小限制异常类
 *
 * @author ruoyi
 */
public class FileSizeLimitExceededException extends FileException
{
    private static final long serialVersionUID = 1L;
    public FileSizeLimitExceededException(long defaultMaxSize)
    {
        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java
New file
@@ -0,0 +1,82 @@
package com.panzhihua.common.exceptions;
import org.apache.commons.fileupload.FileUploadException;
import java.util.Arrays;
/**
 * 文件上传 误异常类
 *
 * @author ruoyi
 */
public class InvalidExtensionException extends FileUploadException
{
    private static final long serialVersionUID = 1L;
    private String[] allowedExtension;
    private String extension;
    private String filename;
    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
    {
        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
        this.allowedExtension = allowedExtension;
        this.extension = extension;
        this.filename = filename;
    }
    public String[] getAllowedExtension()
    {
        return allowedExtension;
    }
    public String getExtension()
    {
        return extension;
    }
    public String getFilename()
    {
        return filename;
    }
    public static class InvalidImageExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;
        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }
    public static class InvalidFlashExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;
        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }
    public static class InvalidMediaExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;
        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }
    public static class InvalidVideoExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;
        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java
@@ -18,6 +18,7 @@
@ApiModel("新增志愿者组织队伍表请求参数")
public class AddComMngVolunteerOrgTeamDto {
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java
@@ -15,6 +15,7 @@
public class AddComMngVolunteerServiceTypeDto {
    private Long id;
    /**
     * 社区id
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java
New file
@@ -0,0 +1,58 @@
package com.panzhihua.common.model.dtos.community.dpc;
import javax.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: AddDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表新增请求参数类
 * @author: hans
 * @date: 2022/06/07 11:00
 */
@Data
@ApiModel("人大代表新增请求参数类")
public class AddDpcDTO {
    @ApiModelProperty("姓名")
    @NotBlank(message = "姓名不能为空")
    private String name;
    @ApiModelProperty("手机号")
    @NotBlank(message = "手机号不能为空")
    private String phone;
    @ApiModelProperty("民族")
    private String nation;
    @ApiModelProperty("性别(1.男 2.女 3.未知)")
    private Integer sex;
    @ApiModelProperty("选区")
    @NotBlank(message = "选区不能为空")
    private String area;
    @ApiModelProperty("所属家/站")
    private String belong;
    @ApiModelProperty("代表类别")
    private String category;
    @ApiModelProperty("单位职务")
    private String position;
    @ApiModelProperty("照片")
    private String photo;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java
New file
@@ -0,0 +1,60 @@
package com.panzhihua.common.model.dtos.community.dpc;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: EditDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表编辑请求参数类
 * @author: hans
 * @date: 2022/06/07 11:06
 */
@Data
@ApiModel("人大代表编辑请求参数类")
public class EditDpcDTO {
    @ApiModelProperty("人大代表id")
    @NotNull(message = "人大代表id不能为空")
    private Long id;
    @ApiModelProperty("姓名")
    @NotBlank(message = "姓名不能为空")
    private String name;
    @ApiModelProperty("手机号")
    @NotBlank(message = "手机号不能为空")
    private String phone;
    @ApiModelProperty("民族")
    private String nation;
    @ApiModelProperty("性别(1.男 2.女 3.未知)")
    private Integer sex;
    @ApiModelProperty("选区")
    @NotBlank(message = "选区不能为空")
    private String area;
    @ApiModelProperty("所属家/站")
    private String belong;
    @ApiModelProperty("代表类别")
    private String category;
    @ApiModelProperty("单位职务")
    private String position;
    @ApiModelProperty("照片")
    private String photo;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java
New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.dtos.community.dpc;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询人大代表请求参数
 * @author: hans
 * @date: 2022/06/07 11:08
 */
@Data
@ApiModel("分页查询人大代表请求参数")
public class PageDpcDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: AddEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业新增请求参数类
 * @author: hans
 * @date: 2022/05/31 10:30
 */
@Data
@ApiModel("社区企业新增请求参数类")
public class AddEnterpriseDTO {
    @ApiModelProperty("企业名称")
    @NotBlank(message = "企业名称不能为空")
    private String name;
    @ApiModelProperty("统一社会信用代码")
    @NotBlank(message = "统一社会信用代码不能为空")
    private String agencyCode;
    @ApiModelProperty("法定代表人")
    @NotBlank(message = "法定代表人不能为空")
    private String legalRepresentative;
    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    private String phone;
    @ApiModelProperty("注册时间")
    private Date registeAt;
    @ApiModelProperty("所属社区")
    @NotNull(message = "所属社区不能为空")
    private Long communityId;
    @ApiModelProperty("地址")
    @NotBlank(message = "地址不能为空")
    private String address;
    @ApiModelProperty("企业介绍")
    private String introduct;
    @ApiModelProperty("企业logo")
    private String logo;
    @ApiModelProperty("服务分类id")
    @NotNull(message = "服务分类不能为空")
    private Long type;
    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: AddEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类新增请求参数类
 * @author: hans
 * @date: 2022/05/31 10:30
 */
@Data
@ApiModel("社区企业服务分类新增请求参数类")
public class AddEnterpriseTypeDTO {
    @ApiModelProperty("服务分类名称")
    @NotBlank(message = "服务分类名称不能为空")
    private String name;
    @ApiModelProperty("状态(1.启用 2.停用)")
    @NotNull(message = "状态不能为空")
    private Integer status;
    @ApiModelProperty("描述")
    private String description;
    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java
New file
@@ -0,0 +1,67 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @title: EditEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业编辑请求参数类
 * @author: hans
 * @date: 2022/05/31 10:45
 */
@Data
@ApiModel("社区企业编辑请求参数类")
public class EditEnterpriseDTO {
    @ApiModelProperty("企业id")
    @NotNull(message = "企业id不能为空")
    private Long id;
    @ApiModelProperty("企业名称")
    @NotBlank(message = "企业名称不能为空")
    private String name;
    @ApiModelProperty("统一社会信用代码")
    @NotBlank(message = "统一社会信用代码不能为空")
    private String agencyCode;
    @ApiModelProperty("法定代表人")
    @NotBlank(message = "法定代表人不能为空")
    private String legalRepresentative;
    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    private String phone;
    @ApiModelProperty("注册时间")
    private Date registeAt;
    @ApiModelProperty("所属社区")
    @NotNull(message = "所属社区不能为空")
    private Long communityId;
    @ApiModelProperty("地址")
    @NotBlank(message = "地址不能为空")
    private String address;
    @ApiModelProperty("企业介绍")
    private String introduct;
    @ApiModelProperty("企业logo")
    private String logo;
    @ApiModelProperty("服务分类id")
    @NotNull(message = "服务分类不能为空")
    private Long type;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java
New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: EditEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类编辑请求参数类
 * @author: hans
 * @date: 2022/05/31 10:45
 */
@Data
@ApiModel("社区企业服务分类编辑请求参数类")
public class EditEnterpriseTypeDTO {
    @ApiModelProperty("分类id")
    @NotNull(message = "分类id不能为空")
    private Long id;
    @ApiModelProperty("服务分类名称")
    @NotBlank(message = "服务分类名称不能为空")
    private String name;
    @ApiModelProperty("状态(1.启用 2.停用)")
    @NotNull(message = "状态不能为空")
    private Integer status;
    @ApiModelProperty("描述")
    private String description;
    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询社区企业请求参数
 * @author: hans
 * @date: 2022/05/31 13:31
 */
@Data
@ApiModel("分页查询社区企业请求参数")
public class PageEnterpriseDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty(value = "状态(1.启用 2.禁用)")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    @ApiModelProperty("服务分类id")
    private Long type;
    @ApiModelProperty(value = "街道id", hidden = true)
    private Long streetId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java
New file
@@ -0,0 +1,36 @@
package com.panzhihua.common.model.dtos.community.enterprise;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询社区企业服务分类请求参数
 * @author: hans
 * @date: 2022/05/31 13:31
 */
@Data
@ApiModel("分页查询社区企业服务分类请求参数")
public class PageEnterpriseTypeDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty(value = "状态(1.启用 2.停用)")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java
@@ -169,4 +169,7 @@
    @ApiModelProperty(value = "房东的用户ID,用户表记录了房东的详细信息", hidden = true)
    private Long hourseOwnerUserId;
    @ApiModelProperty(value = "areaCode", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java
New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.dtos.community.social;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: HatchAuditProcessDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 孵化流程修改
 * @author: hans
 * @date: 2022/04/18 17:36
 */
@Data
@ApiModel("孵化流程修改")
public class HatchAuditProcessDTO {
    @ApiModelProperty("孵化流程")
    private String process;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java
New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.community.social;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageProjectDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询项目数据请求参数
 * @author: hans
 * @date: 2022/04/19 15:23
 */
@Data
@ApiModel("分页查询项目数据请求参数")
public class PageProjectDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java
New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.dtos.community.social;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageProjectSignListDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询项目报名列表请求参数
 * @author: hans
 * @date: 2022/04/15 13:39
 */
@Data
@ApiModel("分页查询项目报名列表请求参数")
public class PageProjectSignListDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
    @ApiModelProperty(value = "项目id", example = "1", required = true)
    @NotNull(message = "项目id不能为空")
    private Long projectId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.dtos.community.social;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageSocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 14:34
 */
@Data
@ApiModel("分页查询孵化申请请求参数")
public class PageSocialOrgHatchAuditDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("申请状态(1.待审核 2.审核通过 3.已驳回)")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.dtos.community.social;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageSocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 14:34
 */
@Data
@ApiModel("分页查询孵化申请请求参数")
public class PageSocialOrgHatchDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化状态(1.孵化中 2.孵化成功)")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java
New file
@@ -0,0 +1,64 @@
package com.panzhihua.common.model.dtos.community.social;
import javax.validation.constraints.NotNull;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: SocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增/编辑孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 15:18
 */
@Data
@ApiModel("新增/编辑孵化申请请求参数")
public class SocialOrgHatchAuditDTO {
    @ApiModelProperty("孵化申请id")
    @NotNull(groups = {PutGroup.class}, message = "孵化申请id不能为空")
    private Long id;
    @ApiModelProperty("准社会组织名称")
    private String name;
    @ApiModelProperty("负责人")
    private String responsibility;
    @ApiModelProperty("联系电话")
    private String phone;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;
    @ApiModelProperty("申请状态(1.待审核 2.审核通过 3.已驳回)")
    private Integer status;
    @ApiModelProperty("组织介绍")
    private String introduction;
    @ApiModelProperty("组织标识")
    private String logo;
    @ApiModelProperty("申请原因")
    private String applyReason;
    @ApiModelProperty("服务范围")
    private String serviceScope;
    @ApiModelProperty("驳回原因")
    private String refuseReason;
    @ApiModelProperty(value = "申请用户", hidden = true)
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java
@@ -18,4 +18,6 @@
    private Integer distance;
    private String areaCode;
    private String appId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
@@ -43,6 +43,8 @@
    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
    private String topicName;
    /**
     * 使用类型(1.邻里圈 2.问题清单 3.需求清单)
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;
    @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
    private Integer status;
    @ApiModelProperty("话题id")
    private Long id;
@@ -31,6 +34,8 @@
    @ApiModelProperty("排序")
    private Integer sort;
    private Long communityId;
    /**
     * 使用类型(1.邻里圈 2.问题清单 3.需求清单)
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
@@ -24,6 +24,10 @@
    @ApiModelProperty("使用类型(1.邻里圈 2.问题清单 3.需求清单)")
    private Integer belongType;
    private Long communityId;
    @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
    private Integer status;
    /**
     * 使用类型(1.邻里圈 2.问题清单 3.需求清单)
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java
@@ -32,4 +32,7 @@
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "区域编码",hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
@@ -53,4 +53,10 @@
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
    @ApiModelProperty(value = "appid", hidden = true)
    private String appid;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java
@@ -26,4 +26,7 @@
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
@@ -34,4 +34,8 @@
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;
    @ApiModelProperty(value = "街道id", hidden = true)
    private Long streetId;
    @ApiModelProperty("关键字")
    private String keyword;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -34,7 +34,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
    @ApiModelProperty("系统用户姓名")
    private String systemName;
    private Date systemName;
    @ApiModelProperty("用户Id")
    private Long userId;
    @ApiModelProperty("参数id")
@@ -69,4 +69,10 @@
    private Integer columnId;
    @ApiModelProperty("二级分类")
    private Integer secondColumnId;
    @ApiModelProperty(value = "是否公示(1.是 2.否)")
    private Integer isPublicity;
    @ApiModelProperty(value = "账号类型 1街道 2社区 3社会组织", hidden = true)
    private Integer userType;
    @ApiModelProperty(value = "社会组织id", hidden = true)
    private Long orgId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
@@ -86,6 +86,9 @@
    @ApiModelProperty(value = "所属组织")
    private String orgName;
    @ApiModelProperty(value = "年龄")
    private Integer age;
    /**
     * 用户id
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -9,6 +9,8 @@
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
@@ -31,6 +33,7 @@
public class LoginUserInfoVO {
    @ApiModelProperty("user_id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("微信会话密钥")
@@ -61,6 +64,7 @@
    @ApiModelProperty("社区id")
    @Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空")
    @NotNull(groups = {PutGroup.class}, message = "社区id不能为空")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty("社区名字")
@@ -120,6 +124,7 @@
    private String tags;
    @ApiModelProperty("家庭id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long familyId;
    @ApiModelProperty(value = "分页每页数量", example = "10")
@@ -141,6 +146,7 @@
    private List<ComMngStructHouseVO> comMngStructHouseVOS;
    @ApiModelProperty("用户小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    // @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
    // @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
    private Long areaId;
@@ -197,7 +203,11 @@
    private Integer isFmsMember;
    @ApiModelProperty("是否网格员 1.是 2.否")
    private Integer isEasyPhotoMember;
    @ApiModelProperty("是否社会组织联系人 1.是 2.否")
    private Integer isOrgContactPeople;
    @ApiModelProperty("是否人大代表成员 1.是 2.否")
    private Integer isDpcMember;
    @ApiModelProperty("appid")
    private String appId;
    @ApiModelProperty("appSecret")
@@ -205,10 +215,15 @@
    @ApiModelProperty("areaCode")
    private String areaCode;
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
    private Integer userType;
    @ApiModelProperty("社会组织Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;
    @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
    private Integer isAcidMember;
@@ -223,6 +238,7 @@
    private Integer isCheckUnitAdmin;
    @ApiModelProperty("报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.advertisement;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,6 +17,7 @@
public class ComOpsAdvJumpVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("跳转内容")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告位置
@@ -15,6 +16,7 @@
public class ComOpsAdvPosVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("广告位置中文描述")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java
@@ -3,7 +3,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +20,7 @@
public class ComOpsAdvVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("广告位置id 1 表示放在首页")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.common;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +28,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
@@ -54,6 +57,7 @@
    private Integer serviceType;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    @ApiModelProperty(value = "状态")
@@ -62,4 +66,18 @@
    @ApiModelProperty(value = "发起人名称")
    private String senderName;
    @ApiModelProperty(value = "得分")
    private Integer score;
    /**
     * 汇报内容
     */
    @ApiModelProperty(value = "汇报内容")
    private String resultContent;
    /**
     * 汇报图片
     */
    @ApiModelProperty(value = "汇报图片")
    private String resultUrl;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.common;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +25,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.common;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.common;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
@@ -3,6 +3,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +28,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 单位名称
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +25,7 @@
public class ComActActEvaluateVO{
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("所属活动id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java
@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.io.Serializable;
import java.util.Date;
@@ -22,6 +23,7 @@
public class ComActActPictureVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("所属活动id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 活动奖品
@@ -15,6 +16,7 @@
public class ComActActPrizeVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("所属活动id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.util.Date;
/**
@@ -21,12 +22,15 @@
public class ComActActRegistVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("所属活动id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long activityId;
    @ApiModelProperty("用户id, 和用户信息表的相关id关联")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("名字")
@@ -73,7 +77,7 @@
    private Integer times;
    @ApiModelProperty(value = "二维码id")
    private Integer codeId;
    private Long codeId;
    @ApiModelProperty(value = "本次签到获取的积分奖励")
    private Integer award;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.panzhihua.common.validated.AddGroup;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,6 +24,7 @@
public class ComActActivityTypeVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("类型名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -6,7 +6,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
@@ -25,6 +26,7 @@
public class ComActActivityVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("活动名称")
@@ -32,6 +34,7 @@
    private String activityName;
    @ApiModelProperty("负责人userID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long sponsorId;
    @ApiModelProperty("负责人名字")
@@ -248,6 +251,7 @@
    private Integer duration;
    @ApiModelProperty("项目Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long projectId;
    @ApiModelProperty("项目名称")
@@ -288,10 +292,14 @@
    private String jumpArticleUrl;
    @ApiModelProperty("关联服务id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long relationId;
    @ApiModelProperty("关联手机")
    private String phone;
    @ApiModelProperty("单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;
    @ApiModelProperty(value = "街道id", hidden = true)
    private Long streetId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,8 @@
@Data
@ApiModel
public class ComActAnnouncementVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
@Data
@ApiModel
public class ComActColumnLevelVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,8 @@
@Data
@ApiModel
public class ComActColumnVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
@@ -56,12 +60,15 @@
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "父类id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    private String description;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
@ApiModel("一起议评论详情")
public class ComActDiscussCommentVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("一起议主键")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
@ApiModel("一起议选项")
public class ComActDiscussOptionVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("一起议主键")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -6,6 +6,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
@ApiModel("一起议议详情")
public class ComActDiscussVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("主题")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComActDpcVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表信息
 * @author: hans
 * @date: 2022/06/07 11:08
 */
@Data
@ApiModel("人大代表信息")
public class ComActDpcVO {
    @ApiModelProperty("人大代表id")
    private Long id;
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("民族")
    private String nation;
    @ApiModelProperty("性别(1.男 2.女 3.未知)")
    private Integer sex;
    @ApiModelProperty("选区")
    private String area;
    @ApiModelProperty("所属家/站")
    private String belong;
    @ApiModelProperty("代表类别")
    private String category;
    @ApiModelProperty("单位职务")
    private String position;
    @ApiModelProperty("照片")
    private String photo;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
public class ComActDynTypeVO {
    @ApiModelProperty("主键(分类编码)")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("分类名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class ComActDynVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标题")
@@ -100,6 +103,9 @@
    private String areaCode;
    @ApiModelProperty("类型(1.社区动态 2.党务公开 3.花城资讯)")
    @ApiModelProperty("是否培训公共")
    private Integer isOrgHatch;
    @ApiModelProperty("类别(1.社区动态 2.招募公告 3.考察记录 4.评审公示 5.孵化培育 6.出壳成果)")
    private Integer category;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
@ApiModel("随手拍评论")
public class ComActEasyPhotoCommentVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("随手拍主键")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java
@@ -3,7 +3,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +17,7 @@
public class ComActEasyPhotoFeedbackVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("随手拍id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -6,9 +6,11 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@
public class ComActEasyPhotoVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("发起人id")
@@ -169,8 +172,14 @@
    @ApiModelProperty(value = "反馈信息列表")
    private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;
    @ApiModelProperty(value = "人大代表反馈信息列表")
    private List<ComActEasyPhotoFeedbackVO> photoFeedbackListForDpc;
    @ApiModelProperty(value = "完成人名称")
    private String completeName;
    @ApiModelProperty(value = "是否上报到人大代表( 0未上报 1已上报)")
    private Integer isReportDpc;
    @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
    private Integer isReportUrban;
@@ -224,4 +233,13 @@
    @ApiModelProperty(value = "微心愿分配人员集合")
    private List<ComActMicroWishHandleVO> handleList;
    @ApiModelProperty(value = "人大代表是否反馈(1.未反馈 2.已反馈)")
    private Integer isFeedBackForDpc;
    @ApiModelProperty(value = "是否人大代表成员 1.是 2.否", hidden = true)
    private Integer isDpcMember;
    @ApiModelProperty(value = "处理记录")
    private List<ComActEasyPhotoHandlerVo> handleRecordList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.model.vos.community;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComActEnterpriseTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类信息
 * @author: hans
 * @date: 2022/06/06 16:05
 */
@Data
@ApiModel("社区企业服务分类信息")
public class ComActEnterpriseTypeVO {
    @ApiModelProperty("分类id")
    private Long id;
    @ApiModelProperty("服务分类名称")
    private String name;
    @ApiModelProperty("描述")
    private String description;
    @ApiModelProperty("状态(1.启用 2.停用)")
    private Integer status;
    @ApiModelProperty("创建人")
    private String createdBy;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @ApiModelProperty("由谁更新")
    private String updatedBy;
    @ApiModelProperty("最后更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updatedAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java
New file
@@ -0,0 +1,61 @@
package com.panzhihua.common.model.vos.community;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComActEnterpriseVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业信息
 * @author: hans
 * @date: 2022/05/31 13:42
 */
@Data
@ApiModel("社区企业信息")
public class ComActEnterpriseVO {
    @ApiModelProperty("企业id")
    private Long id;
    @ApiModelProperty("企业名称")
    private String name;
    @ApiModelProperty("统一社会信用代码")
    private String agencyCode;
    @ApiModelProperty("法定代表人")
    private String legalRepresentative;
    @ApiModelProperty("联系电话")
    private String phone;
    @ApiModelProperty("注册时间")
    private Date registeAt;
    @ApiModelProperty("所属社区")
    private Long communityId;
    @ApiModelProperty("所属社区名称")
    private String communityName;
    @ApiModelProperty("地址")
    private String address;
    @ApiModelProperty("企业介绍")
    private String introduct;
    @ApiModelProperty("企业logo")
    private String logo;
    @ApiModelProperty("服务类型id")
    private Long type;
    @ApiModelProperty("服务类型名称")
    private String typeName;
    @ApiModelProperty("状态(1.启用 2.禁用)")
    private Integer status;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +21,8 @@
@Data
@ApiModel("四长四员实体")
public class ComActFourMemberVO {
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 用户id
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -15,6 +17,7 @@
@ApiModel("留言回复")
public class ComActMessageBackVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("留言id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -15,6 +17,7 @@
@ApiModel("留言")
public class ComActMessageVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("留言内容")
@@ -53,7 +56,7 @@
    @ApiModelProperty(value = "社区主键", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "留言对象 1社区团队2社区团委", hidden = false)
    @ApiModelProperty(value = "留言对象 1社区团队 2社区团委 3人大代表", hidden = false)
    private Long type;
    @ApiModelProperty(value = "回复时间", hidden = true)
    private Date createAt;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@
public class ComActMicroWishVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("发起人id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,6 +11,7 @@
public class ComActQuestnaireAppVO {
    @ApiModelProperty("调查问卷id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("组件唯一key")
    private String projectKey;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,6 +10,7 @@
@ApiModel("问卷题目选项")
public class ComActQuestnaireSubSelectionVO {
    @ApiModelProperty("ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("问题题目ID")
    private Long queSubId;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,6 +10,7 @@
@ApiModel("问卷题目")
public class ComActQuestnaireSubVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("类型 0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框")
    private int type;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -7,7 +9,7 @@
@Data
@ApiModel("预约/登记返回参数")
public class ComActReserveIndexVo {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标题")
    private String title;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -256,7 +256,7 @@
    private String latitude;
    @ApiModelProperty("服务类型")
    private Long serviceType;
    private String serviceType;
    @ApiModelProperty("街道id")
    private Long streetId;
@@ -278,4 +278,31 @@
    @ApiModelProperty("社区名字")
    private String communityName;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;
    @ApiModelProperty("挂靠单位")
    private Long affiliatedUnit;
    @ApiModelProperty("挂靠单位类型(1.街道 2.社区)")
    private Integer affiliatedUnitType;
    @ApiModelProperty("挂靠单位名称")
    private String affiliatedUnitName;
    @ApiModelProperty("承办项目数")
    private Integer undertakeProjectNum;
    @ApiModelProperty("开展活动数")
    private Integer startActNum;
    @ApiModelProperty("孵化进度(1.已进驻 2.孵化中 3.通过评估 4.出壳)")
    private Integer hatchSchedule;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -22,6 +24,7 @@
public class ComActVO {
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty("社区名字")
@@ -86,4 +89,7 @@
    @ApiModelProperty("街道Id")
    private Long streetId;
    @ApiModelProperty("行政区域")
    private String administrativeRegions;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java
@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.io.Serializable;
import java.util.Date;
@@ -22,6 +23,7 @@
public class ComActWorkGuideClassifyVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("分类名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +19,8 @@
public class ComMngStructAreaCityVO {
    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("城市名称")
    private String cityName;
@@ -29,7 +32,7 @@
    private Integer provinceAdcode;
    @ApiModelProperty("省份 id")
    private Integer provinceId;
    private Long provinceId;
    @ApiModelProperty("下属区县")
    private List<ComMngStructAreaDistrictVO> comMngStructAreaDistrictVOS;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,7 +16,8 @@
@ApiModel("区县")
public class ComMngStructAreaDistrictVO {
    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("区县名称")
    private String districtName;
@@ -26,11 +29,11 @@
    private Integer cityAdcode;
    @ApiModelProperty("城市 id")
    private Integer cityId;
    private Long cityId;
    @ApiModelProperty("省份行政区划代码")
    private Integer provinceAdcode;
    @ApiModelProperty("省份 id")
    private Integer provinceId;
    private Long provinceId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +19,8 @@
public class ComMngStructAreaProvinceVO {
    @ApiModelProperty("自增 id")
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("省份名称")
    private String provinceName;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
@@ -5,7 +5,8 @@
import javax.validation.constraints.NotBlank;
import com.panzhihua.common.validated.AddGroup;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +22,7 @@
public class ComMngStructAreaVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("社区id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 其他建筑
@@ -15,6 +16,7 @@
public class ComMngStructBuildTypeVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("建筑类型名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -22,6 +24,7 @@
public class ComMngStructHouseVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("房屋地址编号")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java
@@ -5,7 +5,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 其他建筑
@@ -17,12 +18,14 @@
public class ComMngStructOtherBuildVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("建筑名称")
    private String name;
    @ApiModelProperty("建筑类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long typeId;
    @ApiModelProperty("面积")
@@ -50,5 +53,6 @@
    private String buileTypeName;
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -7,7 +7,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +25,7 @@
public class ComMngVolunteerMngVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("创建时间")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java
@@ -4,6 +4,8 @@
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -25,6 +27,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 状态 0待审核 1已上架 2已驳回 3已下架
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java
@@ -18,6 +18,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
@@ -54,12 +55,14 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty("账号")
@@ -69,6 +72,7 @@
    private String password;
    @ApiModelProperty("权限id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
    @ApiModelProperty("创建时间")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java
@@ -54,4 +54,7 @@
    @ApiModelProperty("账号密码")
    @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
    private String password;
    @ApiModelProperty("行政区域")
    private String administrativeRegions;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java
@@ -6,6 +6,8 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -16,6 +18,7 @@
@ApiModel("留言")
public class PageComActMessageVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("留言内容")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,11 +13,11 @@
@ApiModel
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    private Integer id;
    private String id;
    @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    private Long codeId;
    private String codeId;
    @ApiModelProperty("签到类型 1签到 2签退")
    private Integer signType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,6 +28,7 @@
    private static final long serialVersionUID = 511018347419682300L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -25,7 +27,7 @@
public class ComActAcidDangerMemberVO implements Serializable {
    private static final long serialVersionUID = 889636932941876579L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
@@ -39,6 +41,7 @@
     * 填报记录id
     */
    @ApiModelProperty(value = "填报记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long recordId;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -25,6 +27,7 @@
    private static final long serialVersionUID = -88592294208705755L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +25,7 @@
    private static final long serialVersionUID = 681488919320181854L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@
public class ComActAcidRecordVO implements Serializable {
    private static final long serialVersionUID = 681488919320181854L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
@@ -137,6 +139,7 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("定位地址")
@@ -171,9 +174,11 @@
    private String transportInfo;
    @ApiModelProperty("上一条id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long lastId;
    @ApiModelProperty("下一条id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long nextId;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,6 +28,7 @@
    private static final long serialVersionUID = -90587224071702612L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.List;
@@ -10,6 +12,7 @@
@Data
public class ComAreaCounty {
    private String value;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    private List<ComAreaCounty> children;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
@@ -26,5 +26,7 @@
    private Integer volunteer;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("人大代表")
    private Integer dpcNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java
New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenEasyPhotoStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 随手拍大屏统计数据
 * @author: hans
 * @date: 2021/12/16 13:31
 */
@Data
@ApiModel("随手拍大屏统计数据")
public class BigScreenDpcStatisticsInfo {
    @ApiModelProperty("人大个数")
    private Integer dpcNum;
    @ApiModelProperty(value = "随手拍新增折线数据")
    private List<StatisticsCommVO> easyPhotoAddPolylineData;
    @ApiModelProperty(value = "随手拍累计折线数据")
    private List<StatisticsCommVO> easyPhotoTotalPolylineData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java
New file
@@ -0,0 +1,48 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenFiveAssociationsStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五社联动大屏统计数据
 * @author: hans
 * @date: 2022/06/06 10:48
 */
@Data
@ApiModel("五社联动大屏统计数据")
public class BigScreenFiveAssociationsStatisticsInfo {
    @ApiModelProperty("社区数")
    private Integer communityNum;
    @ApiModelProperty("社会组织数")
    private Integer socialOrgNum;
    @ApiModelProperty("社区企业数")
    private Integer enterpriseNum;
    @ApiModelProperty("社区工作者数")
    private Integer socialWorkerNum;
    @ApiModelProperty("社区志愿者数")
    private Integer volunteerNum;
    @ApiModelProperty("社会组织承接项目数")
    private Integer acceptProjectTotal;
    @ApiModelProperty(value = "社区企业服务分类占比圆形图数据")
    private List<StatisticsCommVO> enterpriseServiceTypeCircleData;
    @ApiModelProperty(value = "社区工作者年龄段占比圆形图数据")
    private List<StatisticsCommVO> socialWorkerAgeStageCircleData;
    @ApiModelProperty(value = "社区工作者服务分类占比圆形图数据")
    private List<StatisticsCommVO> socialWorkerServiceTypeCircleData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenHatchStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 孵化中心大屏统计数据
 * @author: hans
 * @date: 2022/05/31 17:50
 */
@Data
@ApiModel("孵化中心大屏统计数据")
public class BigScreenHatchStatisticsInfo {
    @ApiModelProperty("孵化中心数量/孵化进度数量")
    private Integer hatchCenterTotal;
    @ApiModelProperty("西区社区组织数量")
    private Integer westAreaOrgTotal;
    @ApiModelProperty("孵化成果数量")
    private Integer hatchResultTotal;
    @ApiModelProperty(value = "孵化进程占比圆形图数据")
    private List<StatisticsCommVO> hatchScheduleCircleData;
    @ApiModelProperty(value = "孵化状态占比柱形数据")
    private List<StatisticsCommVO> hatchStatusColumnData;
    @ApiModelProperty(value = "街道组织占比柱形数据")
    private List<StatisticsCommVO> streetOrgColumnData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.cluster.admin;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class PageClusterAdminVo {
    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("群团组织名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.cluster.admin;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class PageClusterMemberAdminVo {
    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("群团组织成员名称")
@@ -34,6 +37,7 @@
    private String idCard;
    @ApiModelProperty("所属群团组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long clusterId;
    @ApiModelProperty("所属群团组织名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.easyPhoto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
@Data
@ApiModel
public class BannerVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("1社区动态、2居民活动、志愿者活动、3党员活动、4问卷调查、5党建动态、6预约登记、7随手拍活动")
    private Integer type;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.easyPhoto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,12 +28,14 @@
    private static final long serialVersionUID = 309168056104824588L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java
@@ -3,6 +3,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class ComFmsClassroomVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标题")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
public class ComFmsServiceEvaluateVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("服务关联id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
public class ComFmsServiceRecordVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("服务关联id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +23,7 @@
public class ComFmsServiceVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("用户姓名")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class ComActIntegralUserRuleAdminVO {
    @ApiModelProperty("积分任务规则id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("积分任务规则名字")
    private String name;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.raffle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,7 +28,7 @@
public class ComActRaffleVO implements Serializable {
    private static final long serialVersionUID = -19557136291047637L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
public class RentingHousesConfigVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("配置名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.reserve;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
public class ComActReserveListAdminVO {
    @ApiModelProperty("预约登记id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("社区id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
@@ -74,4 +74,7 @@
    @ApiModelProperty(value = "街道名字")
    private String streetName;
    @ApiModelProperty("发布人")
    private String releaseName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community.social;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: SocialOrgHatchAuditScheduleVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化审核进度信息
 * @author: hans
 * @date: 2022/04/19 10:25
 */
@Data
@ApiModel("社会组织孵化审核进度信息")
public class SocialOrgHatchAuditScheduleVO {
    @ApiModelProperty("审核进度id")
    private Long id;
    @ApiModelProperty("社会组织孵化申请关联id")
    private Long auditId;
    @ApiModelProperty("审核阶段")
    private String stage;
    @ApiModelProperty("阶段详情")
    private String detail;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java
New file
@@ -0,0 +1,70 @@
package com.panzhihua.common.model.vos.community.social;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: SocialOrgHatchAuditVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请信息
 * @author: hans
 * @date: 2022/04/18 14:33
 */
@Data
@ApiModel("社会组织孵化申请信息")
public class SocialOrgHatchAuditVO {
    @ApiModelProperty("孵化申请id")
    private Long id;
    @ApiModelProperty("准社会组织名称")
    private String name;
    @ApiModelProperty("负责人")
    private String responsibility;
    @ApiModelProperty("联系电话")
    private String phone;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;
    @ApiModelProperty("申请用户")
    private Long userId;
    @ApiModelProperty("申请状态(1.待审核 2.审核通过 3.已驳回)")
    private Integer status;
    @ApiModelProperty("申请时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @ApiModelProperty("组织介绍")
    private String introduction;
    @ApiModelProperty("组织标识")
    private String logo;
    @ApiModelProperty("申请原因")
    private String applyReason;
    @ApiModelProperty("服务范围")
    private String serviceScope;
    @ApiModelProperty("服务范围名称")
    private String serviceScopeName;
    @ApiModelProperty("审核进度")
    private List<SocialOrgHatchAuditScheduleVO> scheduleVOList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java
New file
@@ -0,0 +1,64 @@
package com.panzhihua.common.model.vos.community.social;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: SocialOrgHatchAuditVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请信息
 * @author: hans
 * @date: 2022/04/18 14:33
 */
@Data
@ApiModel("社会组织孵化申请信息")
public class SocialOrgHatchVO {
    @ApiModelProperty("孵化申请id")
    private Long id;
    @ApiModelProperty("准社会组织名称")
    private String name;
    @ApiModelProperty("负责人")
    private String responsibility;
    @ApiModelProperty("联系电话")
    private String phone;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;
    @ApiModelProperty("孵化状态(1.孵化中 2.孵化成功)")
    private Integer status;
    @ApiModelProperty("开始孵化日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @ApiModelProperty("组织介绍")
    private String introduction;
    @ApiModelProperty("组织标识")
    private String logo;
    @ApiModelProperty("申请原因")
    private String applyReason;
    @ApiModelProperty("服务范围")
    private String serviceScope;
    @ApiModelProperty("服务范围名称")
    private String serviceScopeName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -32,7 +33,7 @@
    /**
     * 项目状态  1初创项目 2公开发布 3运作中 4 已结束
     */
    @ApiModelProperty(value = "项目状态  1初创项目 2公开发布 3运作中 4 已结束")
    @ApiModelProperty(value = "项目状态  1待发布 2公示中 3实施中 4 已完成")
    private Integer status;
    /**
@@ -149,4 +150,23 @@
    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;
    @ApiModelProperty(value = "项目联系电话")
    private String phone;
    @ApiModelProperty(value = "项目资金")
    private BigDecimal funds;
    @ApiModelProperty(value = "项目报名截止时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date signUpEnd;
    @ApiModelProperty(value = "公示状态 1报名中 2报名截止 3结果公布")
    private Integer signUpStatus;
    @ApiModelProperty(value = "是否可以进行报名 1是 2否")
    private Integer isCouldSign;
    @ApiModelProperty(value = "是否公示(1.是 2.否)")
    private Integer isPublicity;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.switchs;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,9 +11,11 @@
public class CommunitySwitchAllAppletsVO {
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty("社区名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
@@ -14,13 +14,13 @@
@Data
@ApiModel("义仓物品申领记录实体")
public class ComActWarehouseApplyVO {
    private Integer id;
    private Long id;
    /**
     * 物品id
     */
    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;
    /**
     * 物品数量
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java
@@ -4,7 +4,8 @@
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +18,7 @@
public class ComActEasyPhotoAdminVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("随手拍内容")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分功能
@@ -15,6 +16,7 @@
public class ComOpsAccRuleFuncVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("积分功能描述")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则
@@ -15,6 +16,7 @@
public class ComOpsAccRuleVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("积分功能id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java
@@ -7,7 +7,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分用户关系
@@ -19,6 +20,7 @@
public class ComOpsAccUserVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("用户id,可以关联出名称、手机、社区等信息")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
@ApiModel("修改评论回复状态")
public class ChangeCommentReplyStatusByAdminVO {
    @ApiModelProperty("回复id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("状态(1.显示 2.隐藏)")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class ChangeCommentStatusByAdminVO {
    @ApiModelProperty("评论id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("状态(1.显示 2.隐藏)")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
public class ComActNeighborCircleAdminVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("发布人id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +13,7 @@
@ApiModel("机关单位服务统计返回类")
public class ComActNeighborCircleAnalysisVO  {
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty("机关单位报道社区")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComActNeighborCircleAppVO {
    @ApiModelProperty("邻里圈id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("邻里圈发布人名字")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,12 +21,15 @@
public class ComActNeighborCircleCommentAppVO {
    @ApiModelProperty("邻里圈评论id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("邻里圈id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long circleId;
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("评论用户名字")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComActNeighborCircleCommentReplyAppVO {
    @ApiModelProperty("邻里圈评论回复id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("评论id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -4,6 +4,8 @@
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComActNeighborCircleDetailAppVO {
    @ApiModelProperty("邻里圈id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("邻里圈发布人名字")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
public class ComActNeighborCircleTopicAdminVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("话题名字")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class ComActNeighborCircleTopicAppVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("话题名字")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java
@@ -2,6 +2,8 @@
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,6 +17,7 @@
public class ComActNeighborCommentByAdminVO {
    @ApiModelProperty("评论id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("评论内容")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComActNeighborCommentReplyAppVO {
    @ApiModelProperty("邻里圈回复id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("评论id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
@@ -2,6 +2,8 @@
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,6 +17,7 @@
public class ComActNeighborCommentReplyByAdminVO {
    @ApiModelProperty("评论id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("邻里圈id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
@ApiModel("邻里圈详情")
public class DetailNeighborCircleAdminVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("发布人")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class EditNeighborCircleAdminVO {
    @ApiModelProperty("邻里圈Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,5 +26,6 @@
    private Integer serviceTime;
    @ApiModelProperty("党员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,7 @@
    private Integer serviceTime;
    @ApiModelProperty("单位id'")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long unitId;
    @ApiModelProperty("报道社区id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java
@@ -79,25 +79,25 @@
    private Integer participateVolunteerActivityNum;
    @ApiModelProperty(value = "参与志愿者活动次数百分比")
    private BigDecimal participateVolunteerActivityNumPercent;
    private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与志愿者活动时长")
    private Integer participateVolunteerActivityDuration;
    @ApiModelProperty(value = "参与志愿者活动时长百分比")
    private BigDecimal participateVolunteerActivityDurationPercent;
    private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与党员活动次数")
    private Integer participatePartyActivityNum;
    @ApiModelProperty(value = "参与党员活动次数百分比")
    private BigDecimal participatePartyActivityNumPercent;
    private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与党员活动时长")
    private Integer participatePartyActivityDuration;
    @ApiModelProperty(value = "参与党员活动时长百分比")
    private BigDecimal participatePartyActivityDurationPercent;
    private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
    @ApiModelProperty(value = "月份统计list")
    private List<String> monthList;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java
@@ -2,6 +2,8 @@
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
public class ComPbDynUserVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("党员动态、政策文件id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.partybuilding;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
@Data
@ApiModel
public class ComPbMemberVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class ComPbServiceTeamVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("姓名")
@@ -46,4 +49,7 @@
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;
    @ApiModelProperty("社区名称")
    private String communityName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.partybuilding;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,5 +27,9 @@
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.partybuilding;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -45,6 +47,7 @@
    private Integer type;
    @ApiModelProperty(value = "报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;
    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
@@ -63,9 +66,14 @@
    @ApiModelProperty("归属区")
    private String belongTo;
    private String areaCode;
    @ApiModelProperty("单位性质")
    private String natureName;
    @ApiModelProperty("工作单位")
    private String workUnitName;
    @ApiModelProperty("是否注册小程序(1.是 0.否)")
    private Integer isRegister;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
@ApiModel("党员活动")
public class PartyBuildingActivityVO {
    @ApiModelProperty("党员活动id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("活动名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class PartyBuildingComPbDynVO {
    @ApiModelProperty("党建动态/政策文件id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标题")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -46,6 +46,7 @@
    @ApiModelProperty(value = "状态")
    private String status;
    @ApiModelProperty(value = "党员唯一标识id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -22,6 +24,7 @@
public class PartyCommitteeVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("电话")
@@ -105,4 +108,7 @@
    @ApiModelProperty(value = "身份证")
    private String idCard;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java
@@ -18,6 +18,7 @@
@ApiModel("党组织")
public class PartyOrganizationVO {
    @ApiModelProperty(value = "党组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 负责人
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:45
 **/
@Data
@ApiModel("负责人")
public class ActivityManagerVO {
    @ApiModelProperty("负责人id")
    private Long managerId;
    @ApiModelProperty("负责人名字")
    private String name;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java
New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * @author lyq
 * 查询党建数据统计党组织返回参数
 */
@Data
@ApiModel("查询党建数据统计党组织返回参数")
public class ComDataStatisticsHeaderOrgVo {
    @ApiModelProperty(value = "党组织数量")
    private Integer orgNum = 0;
    @ApiModelProperty(value = "党组织绑定小区数量")
    private Integer areaNum = 0;
    @ApiModelProperty(value = "社区下小区数量")
    private Integer villageNum = 0;
    @ApiModelProperty(value = "小区覆盖率")
    private BigDecimal villageRate = BigDecimal.ZERO;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java
New file
@@ -0,0 +1,108 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author lyq
 * 分页查询党建数据统计返回参数
 */
@Data
@ApiModel("分页查询党建数据统计返回参数")
public class ComDataStatisticsMemberVo {
    @ApiModelProperty(value = "党员id")
    private Long id;
    @ApiModelProperty(value = "党员姓名")
    private String name;
    @ApiModelProperty(value = "党员头像url")
    private String photoPath;
    @ApiModelProperty(value = "是否是党委(1.是 2.否)")
    private Integer isRole;
    @ApiModelProperty(value = "党员类型(1.预备党员 2.正式党员)")
    private Integer type;
    @ApiModelProperty(value = "性别(1.是 2.否)")
    private Integer sex;
    @ApiModelProperty(value = "年龄")
    private Integer age;
    @ApiModelProperty(value = "党龄")
    private Integer partyAge;
    @ApiModelProperty(value = "职能")
    private String function;
    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
    private Integer specialtyCategory;
    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "职位")
    private String position;
    @ApiModelProperty(value = "职位2")
    private String positionTwo;
    @ApiModelProperty(value = "身份证号")
    private String idCard;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;
    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;
    @ApiModelProperty(value = "所属党组织id")
    private Long orgId;
    @ApiModelProperty(value = "所属党组织名称")
    private String orgName;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    @ApiModelProperty(value = "总活动次数")
    private Integer activityCount;
    @ApiModelProperty(value = "总活动时长(小时)")
    private Integer activityDuration;
    @ApiModelProperty(value = "党员活动次数")
    private Integer partyActivityCount;
    @ApiModelProperty(value = "党员活动时长(小时)")
    private Integer partyActivityDuration = 0;
    @ApiModelProperty(value = "党员活动积分数量")
    private Integer partyActivityIntegral;
    @ApiModelProperty(value = "志愿者活动次数")
    private Integer volunteerActivityCount;
    @ApiModelProperty(value = "志愿者活动时长(小时)")
    private Integer volunteerActivityDuration;
    @ApiModelProperty(value = "志愿者活动积分数量")
    private Integer volunteerActivityIntegral;
    @ApiModelProperty(value = "完成微心愿数量")
    private Integer wishCount;
    @ApiModelProperty(value = "完成随手拍数量")
    private Integer easyCount;
    @ApiModelProperty(value = "用户id")
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java
New file
@@ -0,0 +1,122 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
 * @author lyq
 * 查询党建数据统计党组织返回参数
 */
@Data
@ApiModel("查询党建数据统计党组织返回参数")
public class ComDataStatisticsOrgVo {
    @ApiModelProperty(value = "党员人数")
    private Integer partyMemberNum;
    @ApiModelProperty(value = "正式党员人数")
    private Integer formalPartyMemberNum;
    @ApiModelProperty(value = "正式党员人数百分比")
    private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "预备党员人数")
    private Integer preparePartyMemberNum;
    @ApiModelProperty(value = "预备党员人数百分比")
    private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "体育类党员人数")
    private Integer tyNum;
    @ApiModelProperty(value = "体育类党员人数百分比")
    private BigDecimal tyNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "美术类党员人数")
    private Integer msNum;
    @ApiModelProperty(value = "美术类党员人数百分比")
    private BigDecimal msNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "音乐类党员人数")
    private Integer yyNum;
    @ApiModelProperty(value = "音乐类党员人数百分比")
    private BigDecimal yyNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "舞蹈类党员人数")
    private Integer wdNum;
    @ApiModelProperty(value = "舞蹈类党员人数百分比")
    private BigDecimal wdNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "其他类党员人数")
    private Integer qtNum;
    @ApiModelProperty(value = "其他类党员人数百分比")
    private BigDecimal qtNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "无类型党员人数")
    private Integer wuNum;
    @ApiModelProperty(value = "无类型党员人数百分比")
    private BigDecimal wuNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "党员列表")
    private List<PartyBuildingMemberVO> partyMemberList;
    @ApiModelProperty(value = "参与活动次数")
    private Integer participateActivityNum;
    @ApiModelProperty(value = "参与活动时长")
    private Integer participateActivityDuration;
    @ApiModelProperty(value = "参与志愿者活动次数")
    private Integer participateVolunteerActivityNum;
    @ApiModelProperty(value = "参与志愿者活动次数百分比")
    private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与志愿者活动时长")
    private Integer participateVolunteerActivityDuration;
    @ApiModelProperty(value = "参与志愿者活动时长百分比")
    private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与党员活动次数")
    private Integer participatePartyActivityNum;
    @ApiModelProperty(value = "参与党员活动次数百分比")
    private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
    @ApiModelProperty(value = "参与党员活动时长")
    private Integer participatePartyActivityDuration;
    @ApiModelProperty(value = "参与党员活动时长百分比")
    private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
    @ApiModelProperty(value = "月份统计list")
    private List<String> monthList;
    @ApiModelProperty(value = "完成微心愿折线统计数据")
    private List<String> completeWishList;
    @ApiModelProperty(value = "累计微心愿折线统计数据")
    private List<String> cumulativeWishList;
    @ApiModelProperty(value = "完成随手拍折线统计数据")
    private List<String> completeEasyList;
    @ApiModelProperty(value = "累计随手拍折线统计数据")
    private List<String> cumulativeEasyList;
    @ApiModelProperty(value = "完成微心愿数量")
    private String wishNum = "0";
    @ApiModelProperty(value = "完成随手拍数量")
    private String easyNum = "0";
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java
New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComEldersAuthHistoryExcelVO {
    @ExcelProperty(value = "姓名", index = 0)
    private String name;
    @ExcelProperty(value = "身份证号", index = 1)
    private String idCard;
    @ExcelProperty(value = "出生年月", index = 2)
    private String brithday;
    @ExcelProperty(value = "年龄", index = 3)
    private Date age;
    @ExcelProperty(value = "户籍地", index = 4)
    private Date domicile;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java
New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 动态、政策文件、阅读记录
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-02 17:17
 **/
@Data
@ApiModel("党员动态阅读记录表")
public class ComPbDynUserVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("党员动态、政策文件id")
    private Long dynId;
    @ApiModelProperty("小程序用户id")
    private Long userId;
    @ApiModelProperty("阅读时间")
    private Date createAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComPbMemberExcelVO {
    @ExcelProperty(value = "账号", index = 0)
    private String phone;
    @ExcelProperty(value = "党员姓名", index = 1)
    private String name;
    @ExcelProperty(value = "所属党组织", index = 2)
    private String orgName;
    @ExcelProperty(value = "入党日期", index = 3)
    private Date joinTime;
    @ExcelProperty(value = "转正日期", index = 4)
    private Date employmentTime;
    @ExcelProperty(value = "报道单位", index = 5)
    private String checkUnitName;
    @ExcelProperty(value = "党龄", index = 6)
    private Integer partyAge;
    @ExcelProperty(value = "状态",index = 7)
    private String status;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java
New file
@@ -0,0 +1,97 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class ComPbMemberVO {
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 所属党组织id
     */
    @ApiModelProperty("所属党组织id")
    private Long orgId;
    /**
     * 身份证号
     */
    @ApiModelProperty("身份证号")
    private String idCard;
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    private String name;
    /**
     * 头像图片路径
     */
    @ApiModelProperty("头像图片路径")
    private String photoPath;
    /**
     * 入党时间
     */
    @ApiModelProperty("入党时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;
    /**
     * 转正时间
     */
    @ApiModelProperty("转正时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date employmentTime;
    /**
     * 党员审查结果
     */
    private Integer auditResult;
    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;
    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 驳回原因
     */
    private String refuseReason;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("党组织")
    private String orgName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 服务团队人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:11
 **/
@Data
@ApiModel("服务团队人员")
public class ComPbServiceTeamVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("职位")
    private String job;
    @ApiModelProperty("职位2")
    private String jobTwo;
    @ApiModelProperty("岗位职责")
    private String jobResponsibilities;
    @ApiModelProperty("照片")
    private String url;
    @ApiModelProperty("create_at")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;
    @ApiModelProperty("社区名称")
    private String communityName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿服务团队人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:11
 **/
@Data
@ApiModel("微心愿服务团队人员")
public class ComPbServiceTeamWishVO {
    @ApiModelProperty("managerId")
    private Long managerId;
    @ApiModelProperty("姓名")
    private String name;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java
New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页活动人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 09:50
 **/
@Data
@ApiModel(value = "分页活动人员")
public class PageActivityMembersVO {
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "姓名")
    private String name;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "报名时间")
    private String registrationTime;
    @ApiModelProperty(value = "人员主键")
    private Long id;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "活动id", required = true)
    private Long activityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java
New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页党员认证
 * @author: cedoo
 * @create: 2021-4-7
 **/
@Data
@ApiModel(value = "分页党员认证")
public class PagePartyBuildingMemberVO {
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "状态")
    private Integer auditStatus;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 16:10
 **/
@Data
@ApiModel(value = "分页查询党员")
public class PagePartyOrganizationVO {
    @ApiModelProperty(value = "组织名字")
    private String orgName;
    @ApiModelProperty(value = "组织ID")
    private Long orgId;
    @ApiModelProperty(value = "账户")
    private String account;
    @ApiModelProperty(value = "党员姓名")
    private String name;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "关键词")
    private String keyWord;
    @ApiModelProperty(value = "党员类型(1.预备党员 2.正式党员)")
    private Integer type;
    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;
    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
    private Long specialtyCategory;
    @ApiModelProperty("开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;
    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
    private String specialtyName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java
New file
@@ -0,0 +1,109 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 09:08
 **/
@Data
@ApiModel("党员活动")
public class PartyBuildingActivityVO {
    @ApiModelProperty("党员活动id")
    private Long id;
    @ApiModelProperty("活动名称")
    private String name;
    @ApiModelProperty("活动地点")
    private String address;
    @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布时间")
    private Date releaseTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布开始时间")
    private Date releaseTimeBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布结束时间")
    private Date releaseTimeEnd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动开始时间")
    private Date activityTimeBegin;
    @ApiModelProperty("活动开始时间-格式化后的")
    private String activityTimeBeginFormat;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动结束时间")
    private Date activityTimeEnd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("报名开始时间")
    private Date enrollTimeBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("报名结束时间")
    private Date enrollTimeEnd;
    @ApiModelProperty("当前页数")
    private Long pageNum;
    @ApiModelProperty("每页记录数")
    private Long pageSize;
    @ApiModelProperty("活动最多参入人数")
    private Integer participationNum;
    @ApiModelProperty("活动最低参入人数-未达到到时间自动取消")
    private Integer participationLowestNum;
    @ApiModelProperty("活动已经参与人数")
    private Integer participationActualNum;
    @ApiModelProperty("活动封面")
    private String cover;
    @ApiModelProperty("活动内容-富文本")
    private String richText;
    @ApiModelProperty("取消原因")
    private String cancelReason;
    @ApiModelProperty("发布人id")
    private Long createBy;
    @ApiModelProperty("发布人名字")
    private String createByName;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("活动党员列表")
    private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
    @ApiModelProperty("是否已经报名")
    private Integer isSign;
    @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
    private List<Long> userIds;
    @ApiModelProperty("是否是小程序请求")
    private Integer isAppliets;
    @ApiModelProperty("是否是个人发起 1 是 0 否")
    private Integer isPerson;
    @ApiModelProperty("二维码类型 1居民,志愿者 2党员")
    private Integer codeType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java
New file
@@ -0,0 +1,98 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党建动态
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 15:53
 **/
@Data
@ApiModel("社区管理》党建》党员动态/政策文件")
public class PartyBuildingComPbDynVO {
    @ApiModelProperty("党建动态/政策文件id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标题")
    private String title;
    @ApiModelProperty("状态 1 待发布 2 已发布")
    private Integer status;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布时间")
    private Date publishAt;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布开始时间")
    private Date publishAtBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布结束时间")
    private Date publishAtEnd;
    @ApiModelProperty("封面url")
    private String cover;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("内容")
    private String content;
    @ApiModelProperty("发布人id")
    private Long createBy;
    @ApiModelProperty("发布人名字")
    private String createByName;
    @ApiModelProperty("阅读量")
    private Integer readingVolume;
    @ApiModelProperty("当前页数")
    private Long pageNum;
    @ApiModelProperty("每页记录数")
    private Long pageSize;
    @ApiModelProperty("1动态 2政策文件")
    private Integer type;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("动态内容富文本--纯文本")
    private String contentText;
    @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
    private Integer isAdd;
    @ApiModelProperty("动态分类:1-党建动态 2-党员帮扶 3-党员示范")
    private Integer dynType;
    @ApiModelProperty("封面模式:1-小图展示 2-大图展示")
    private Integer coverMode;
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("跳转链接")
    private String jumpUrl;
    @ApiModelProperty("跳转状态")
    private Integer jumpType;
    @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
    private Integer policyType;
    @ApiModelProperty("排序方式 正序 ASC")
    private String sort;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java
New file
@@ -0,0 +1,46 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 批量党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 14:57
 **/
@Data
public class PartyBuildingMemberExcelVO implements Serializable {
    /**
     * 党员姓名
     */
    @ExcelProperty(value = "党员姓名", index = 0)
    private String name;
    /**
     * 身份证号
     */
    @ExcelProperty(value = "身份证号", index = 1)
    private String idCard;
    /**
     * 所属党组织
     */
    @ExcelProperty(value = "所属党组织", index = 2)
    private String orgName;
    /**
     * 入党日期
     */
    @ExcelProperty(value = "入党日期", index = 3)
    private String joinTime;
    /**
     * 转正日期
     */
    @ExcelProperty(value = "转正日期", index = 4)
    private String employmentTime;
    /**
     * 所属社区
     */
    @ExcelProperty(value = "所属社区", index = 5)
    private String communityName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java
New file
@@ -0,0 +1,92 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党建
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 10:03
 **/
@Data
@ApiModel("社区管理》党建》党员信息")
public class PartyBuildingMemberVO {
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "身份证")
    private String idCard;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "入党时间")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;
    @ApiModelProperty(value = "所属党组织id")
    private Long orgId;
    @ApiModelProperty(value = "头像图片路径")
    private String photoPath;
    @ApiModelProperty(value = "社区ID", hidden = true)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "社区名字")
    private String communityName;
    @ApiModelProperty(value = "党组织名字")
    private String orgName;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "党龄")
    private Integer partyAge;
    @ApiModelProperty(value = "状态")
    private String status;
    @ApiModelProperty(value = "党员唯一标识id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty(value = "用户ID", hidden = true)
    private Long userId;
    @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
    private Integer auditResult;
    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;
    @ApiModelProperty(value = "是否党员 1是 2否")
    private Integer isPb;
    @ApiModelProperty(value = "党员类型(1.预备党员 2.正式党员)")
    private Integer type;
    @ApiModelProperty(value = "职位")
    private String position;
    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;
    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;
    @ApiModelProperty(value = "职能")
    private String function;
    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
    private Integer specialtyCategory;
    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "职位2")
    private String positionTwo;
    @ApiModelProperty(value = "活动时长")
    private Integer partyTime;
    @ApiModelProperty(value = "活动积分")
    private Integer partyInterval;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java
New file
@@ -0,0 +1,112 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党委
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 14:15
 **/
@Data
@ApiModel("党委")
public class PartyCommitteeVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("电话")
    @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;
    @ApiModelProperty("姓名")
    @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
    private String name;
    @ApiModelProperty("性别")
    private Integer sex;
    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthTime;
    @ApiModelProperty(value = "年龄")
    private Integer age;
    @ApiModelProperty("职位")
    @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
    private String position;
    @ApiModelProperty("职位2")
    private String positionTwo;
    @ApiModelProperty("岗位职责")
    @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
    private String jobResponsibilities;
    @ApiModelProperty("头像图片路径")
    @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
    private String photoPath;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "关键词")
    private String keyWord;
    @ApiModelProperty(value = "党委标签(1.社区党委 2.区域党委委员)")
    private Integer type;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "入党时间")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;
    @ApiModelProperty(value = "职能")
    private String function;
    @ApiModelProperty(value = "特长类别(1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他)")
    private Integer specialtyCategory;
    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;
    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;
    @ApiModelProperty(value = "负责党组织id")
    private Long orgId;
    @ApiModelProperty(value = "负责党组织名字")
    private String orgName;
    @ApiModelProperty(value = "身份证")
    private String idCard;
    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java
New file
@@ -0,0 +1,78 @@
package com.panzhihua.common.model.vos.partybuilding.west;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 11:15
 **/
@Data
@ApiModel("党组织")
public class PartyOrganizationVO {
    @ApiModelProperty(value = "党组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
    @ApiModelProperty(value = "状态")
    private Integer status;
    @ApiModelProperty(value = "党员人数")
    private Integer countPerson;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
    @ApiModelProperty(value = "关键词")
    private String keyWord;
    @ApiModelProperty(value = "上级id")
    private Long parentId;
    @ApiModelProperty(value = "组织类别(1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组)")
    private Integer type;
    @ApiModelProperty(value = "组织隶属(1.乡镇 2.机关 3.域市街道 3.域市社区(居委会) 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他)")
    private Integer subjection;
    @ApiModelProperty(value = "小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long areaId;
    @ApiModelProperty(value = "楼栋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long buildId;
    @ApiModelProperty(value = "楼栋名称")
    private String buildName;
    @ApiModelProperty(value = "所属小区名字")
    private String areaName;
    @ApiModelProperty(value = "组织地址")
    private String address;
    @ApiModelProperty(value = "经度")
    private String longitude;
    @ApiModelProperty(value = "纬度")
    private String latitude;
    @ApiModelProperty(value = "一级id")
    private Long oneId;
    @ApiModelProperty(value = "二级id")
    private Long twoId;
    @ApiModelProperty(value = "三级id")
    private Long thirdId;
    @ApiModelProperty(value = "四级id")
    private Long fourId;
    @ApiModelProperty(value = "五级id")
    private Long fiveId;
    @ApiModelProperty(value = "党组织负责人名称")
    private String userName;
    @ApiModelProperty(value = "党组织负责人联系电话")
    private String phone;
    @ApiModelProperty(value = "党组织下子组织")
    private List<PartyOrganizationVO> childList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
@@ -62,7 +62,7 @@
    /**
     * 设备类型
     */
    @ApiModelProperty(value = "设备类型 1异常报警 2一键报警 ")
    @ApiModelProperty(value = "设备类型 1一键报警 2异常报警 ")
    private Integer type;
    @ApiModelProperty(value = "手机号")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.property;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +11,8 @@
@Data
@ApiModel
public class ComPropertyRepairVO {
    private Integer id;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 报修内容
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.property;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
public class ComPropertyWorkerVO {
    @ApiModelProperty(value = "物业工作人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "工作人员姓名")
@@ -31,5 +34,6 @@
    private String image;
    @ApiModelProperty(value = "物业公司关联id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long refId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -68,6 +70,7 @@
    private Long loginUserId;
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("商家简介")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -6,6 +6,8 @@
import javax.validation.constraints.Pattern;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -36,6 +38,7 @@
    private String name;
    @ApiModelProperty("角色")
    @JsonSerialize(using = ToStringSerializer.class)
    @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
    private Long roleId;
@@ -57,6 +60,7 @@
    private Long communityId;
    @ApiModelProperty(value = "用户主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty(value = "当前页数")
@@ -94,12 +98,14 @@
    private String areaCode;
    @ApiModelProperty(value = "街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    @ApiModelProperty(value = "三社账户类型  1街道 2社会组织 3社会组织成员")
    private Integer socialType;
    @ApiModelProperty("社会组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;
    @ApiModelProperty("绑定单位")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 工作类型
@@ -15,6 +16,7 @@
public class ComMngJobSetVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("工作名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java
@@ -5,6 +5,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +22,7 @@
public class ComMngTagVO implements Serializable {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标签名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java
@@ -3,7 +3,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 用户标签
@@ -15,6 +16,7 @@
public class ComMngUserTagVO {
    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("标签名称")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java
@@ -12,7 +12,7 @@
public class StreetVO implements Serializable {
    @ApiModelProperty("街道id")
    private Integer id;
    private Long id;
    @ApiModelProperty("街道名")
    private String name;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java
@@ -10,7 +10,7 @@
@ApiModel
public class StreetVOS {
    @ApiModelProperty("街道id")
    private Integer id;
    private Long id;
    @ApiModelProperty("街道名")
    private String name;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class SysUserAgreementVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("所属app 1居民端app 2网格员端app 3商家端app 4隐私政策 5随手拍说明")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class SysUserFeedbackVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("反馈内容")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class SysUserNoticeVO {
    @ApiModelProperty("id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty("用户id")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class SysUserVO {
    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("手机号")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -22,7 +22,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginApplets")
    R loginApplets(@RequestParam("openId") String openId);
    R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid);
    /**
     * 用户登出
@@ -44,7 +44,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginCommunityBackage")
    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 小程序后台登录
@@ -56,7 +56,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginAppletsBackStage")
    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 认证中心刷新token
@@ -78,7 +78,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginShopBackStage")
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 网格综治APP登录
@@ -90,7 +90,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 网格综治后台登录
@@ -102,7 +102,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginGridBackstage")
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 城管后台登录
@@ -111,7 +111,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginCgBackage")
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 一键报警APP登录
@@ -120,7 +120,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginAlarmApp")
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 便民服务商家后台登录
@@ -132,7 +132,7 @@
     * @return 登录结果
     */
    @PostMapping("/loginMerchantBackStage")
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 西区大屏登录
@@ -141,7 +141,7 @@
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
    /**
     * 微商业街用户登录
@@ -153,5 +153,5 @@
     * @return 登录结果
     */
    @PostMapping("/loginMcsUser")
    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,16 +3,15 @@
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.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
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;
@@ -23,10 +22,7 @@
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;
@@ -35,12 +31,6 @@
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.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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;
@@ -52,7 +42,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
@@ -61,6 +50,17 @@
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.EditComActEasyPhotoHandlerDto;
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.PageComActEasyPhotoHandlerDto;
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;
@@ -109,7 +109,6 @@
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
@@ -157,7 +156,6 @@
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
@@ -180,18 +178,12 @@
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
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.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
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.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
@@ -244,13 +236,30 @@
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.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
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;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
@@ -286,7 +295,6 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -320,7 +328,6 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -387,7 +394,6 @@
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.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
@@ -396,8 +402,6 @@
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;
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
@@ -2269,10 +2273,11 @@
     *
     * @param provinceAdcode
     *            省份code
     * @param areaCode
     * @return 查询结果
     */
    @GetMapping("/common/data/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
    /**
     * 分页查询街道
@@ -5506,7 +5511,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList(@RequestParam("areaCode") String areaCode);
    R communitySwitchList(@RequestParam("appId") String appId);
    /**
     * 根据名字查询所有社区列表
@@ -5516,7 +5521,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode);
    R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "appId") String appId);
    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -6334,7 +6339,7 @@
     * @return 单条数据
     */
    @GetMapping("/comActFourMember/{id}")
    R comActFourMemberSelectOne(@PathVariable("id") Integer id);
    R comActFourMemberSelectOne(@PathVariable("id") Long id);
    /**
     * 新增数据
@@ -7658,7 +7663,7 @@
    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();
    void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);
    /**
     * 西区大屏治理数据
@@ -8792,10 +8797,11 @@
    /**
     * 小程序详情接口
     * @param id
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialProject/getApplet")
    R getAppletComActSocialProject(@RequestParam("id") Long id);
    R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
    /**
     * 分页查询所有数据
@@ -9906,7 +9912,355 @@
                                       @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,
                                       @RequestParam(value = "loginAccount",required = false) String loginAccount);
                                       @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
    /**
     * 批量删除活动
     * @param ids
     * @return
     */
    @PostMapping("batchDel")
    R deleteActivities(@RequestBody List<Long> ids);
    /**
     * 街道详情
     * @param id
     * @return
     */
    @GetMapping("detailStreet")
    R detailStreet(@RequestParam("id") Long id);
    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    @PostMapping("/comActSocialProject/signList")
    R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO);
    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/page")
    R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO);
    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/detail")
    R detailHatchAudit(@RequestParam("id") Long id);
    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/update")
    R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatch/page")
    R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO);
    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatch/detail")
    R detailOrgHatch(@RequestParam("id") Long id);
    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @PutMapping("/comActSocialOrgHatch/updateStatus")
    R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
    /**
     * 获取孵化流程配置
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/process")
    R getHatchAuditProcess();
    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @PutMapping("/comActSocialOrgHatchAudit/process")
    R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO);
    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/add")
    R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/schedule")
    R getHatchAuditSchedule(@RequestParam("userId") Long userId);
    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialProject/sign")
    R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId);
    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    @PostMapping("/comActSocialProject/project")
    R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO);
    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/delete")
    R deleteHatchAudit(@RequestParam("id") Long id);
    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatch/delete")
    R deleteOrgHatch(@RequestParam("id") Long id);
    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/add")
    R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO);
    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/edit")
    R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO);
    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @DeleteMapping("/enterprise/delete")
    R deleteEnterprise(@RequestParam("id") Long id);
    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @GetMapping("/enterprise/detail")
    R detailEnterprise(@RequestParam("id") Long id);
    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/page")
    R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO);
    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/hatch/base")
    R getHatchBaseData(@RequestParam("communityId") Long communityId);
    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/hatchResult/list")
    R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/hatchSchedule/list")
    R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fiveAssociations/base")
    R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId);
    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/socialProject/list")
    R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/socialOrg/list")
    R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/add")
    R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO);
    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/edit")
    R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO);
    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @DeleteMapping("/enterpriseType/delete")
    R deleteEnterpriseType(@RequestParam("id") Long id);
    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @GetMapping("/enterpriseType/detail")
    R detailEnterpriseType(@RequestParam("id") Long id);
    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/page")
    R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);
    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @GetMapping("/enterpriseType/list")
    R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);
    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @PostMapping("/dpc/add")
    R addDpc(@RequestBody AddDpcDTO addDpcDTO);
    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @PostMapping("/dpc/edit")
    R editDpc(@RequestBody EditDpcDTO editDpcDTO);
    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @DeleteMapping("/dpc/delete")
    R deleteDpc(@RequestParam("id") Long id);
    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @GetMapping("/dpc/detail")
    R detailDpc(@RequestParam("id") Long id);
    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @PostMapping("/dpc/page")
    R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);
    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("/dpc/feedback")
    R getFeedbackList(@RequestParam("id") Long id);
    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("/dpc/feedback")
    R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @GetMapping("/screen/dpc/base")
    R dpcBase(@RequestParam("communityId") Long communityId);
    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/dpc/easyPhotoList")
    R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/comActEasyPhotoHandler/detail")
    R detailEasyPhotoHandler(@RequestParam("id") Long id);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java
New file
Diff too large
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java
New file
@@ -0,0 +1,605 @@
package com.panzhihua.common.service.partybuilding;
import java.util.List;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党建
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 09:50
 **/
@FeignClient(value = "huacheng-partybuilding", contextId = "partybuilding1")
public interface PartyBuildingWestService {
    /**
     * 新增党员
     *
     * @param partyBuildingMemberVO
     *            党员基本信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/addpartybuildingmember")
    R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIngWest/listpartyorganization")
    R listPartyOrganization(@RequestParam("communityId") Long communityId);
    /**
     * 分页查询所有的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIngWest/listpartyorganizationAll")
    R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 查询所有党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    @PostMapping("/partybuildIngWest/getPbOrgAllList")
    R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 新增党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/addpartyorganization")
    R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 编辑党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/updatepartyorganization")
    R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 启用,禁用党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/resetpartyorganization")
    R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 删除党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deletepartyorganization")
    R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    /**
     * 批量新增党员
     *
     * @param list
     *            党员集合
     */
    @PostMapping("/partybuildIngWest/listsavepartybuildingmemberexcelvo")
    R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list);
    /**
     * 分页查询党员信息
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @PostMapping("/partybuildIngWest/pagepartyorganization")
    R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
    /**
     * 导出党员信息
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @PostMapping("/partybuildIngWest/exportPartyMember")
    R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
    /**
     * 党员活动
     *
     * @param partyBuildingActivityVO
     *            党员活动查询参数
     * @return 参加的所有活动
     */
    @PostMapping("/partybuildIngWest/listpartymemberactivities")
    R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
    /**
     * 活动报名名单分页查询
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
     */
    @PostMapping("/partybuildIngWest/pageactivitymembers")
    R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO);
    /**
     * 编辑党员信息 新增字段均可编辑
     *
     * @param partyBuildingMemberVO
     *            编辑字段
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/updatepartybuildingmember")
    R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
    /**
     * 党员活动详情
     *
     * @param id
     *            活动id
     * @return 活动详情内容
     */
    @PostMapping("/partybuildIngWest/activityinfo")
    R activityinfo(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 查询指定社区的所有党员
     *
     * @param communityId
     *            社区id
     * @return 党员列表
     */
    @PostMapping("/partybuildIngWest/listPartyMember")
    R listPartyMember(@RequestParam("communityId") Long communityId);
    /**
     * 社区下拉选择身份
     *
     * @return 身份集合
     */
    @PostMapping("/partybuildIngWest/listidentity")
    R listIdentity();
    /**
     * 新增党委
     *
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/addpartycommittee")
    R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 编辑党委
     *
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/updatepartycommittee")
    R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 删除党委
     *
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deletepartycommittee")
    R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 分页社区党委查询
     *
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("/partybuildIngWest/pagepartycommittee")
    R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 新建党建动态
     *
     * @param partyCommitteeVO
     *            动态内容
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/adddynamic")
    R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
    /**
     * 编辑动态
     *
     * @param partyCommitteeVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/updatedynamic")
    R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
    /**
     * 动态详情
     *
     * @param id
     *            动态主键
     * @return 详情
     */
    @PostMapping("/partybuildIngWest/infodynamic")
    R infoYnamic(@RequestParam("id") Long id);
    /**
     * 分页查询党员动态/政策文件
     *
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
     */
    @PostMapping("/partybuildIngWest/pagedynamic")
    R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO);
    /**
     * 删除动态
     *
     * @param id
     *            动态主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deletedynamic")
    R deleteYnamic(@RequestParam("id") Long id);
    /**
     * 新增党员活动
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/addactivity")
    R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
    /**
     * 编辑党员活动
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/updateactivity")
    R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
    /**
     * 发布党员活动
     *
     * @param id
     *            主键id
     * @return 发布结果
     */
    @PostMapping("/partybuildIngWest/releaseactivity")
    R releaseActivity(@RequestParam("id") Long id);
    /**
     * 删除党员活动
     *
     * @param id
     *            主键id
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deleteactivity")
    R deleteActivity(@RequestParam("id") Long id);
    /**
     * 分页查询党员活动
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
     */
    @PostMapping("/partybuildIngWest/pageactivity")
    R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
    /**
     * 增加阅读记录
     *
     * @param comPbDynUserVO
     *            记录内容
     * @return 增加结果
     */
    @PostMapping("/partybuildIngWest/adddynuser")
    R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO);
    /**
     * 删除党员
     *
     * @param id
     *            党员主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deletepartybuildingmember")
    R deleteDynUser(@RequestParam("id") Long id);
    /**
     * 取消活动
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
     */
    @PostMapping("/partybuildIngWest/cancelactivity")
    R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
    /**
     * 用户的所有党建活动
     *
     * @param userId
     *            用户id
     * @param communityId
     *            社区id 同一用户在不同社区都是党员
     * @param status
     * @return 党建活动列表
     */
    @PostMapping("/partybuildIngWest/listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
                   @RequestParam(value = "status", required = false) Integer status);
    /**
     * 党员活动人员参入列表
     *
     * @param id
     *            活动id
     * @return 党员集合
     */
    @PostMapping("/partybuildIngWest/listpartybuildingmember")
    R listPartyBuildingMember(@RequestParam("id") Long id);
    /**
     * 报名、取消报名党员活动
     *
     * @param activitySignUpDTO
     *            操作参数
     * @return 操作结果
     */
    @PostMapping("/partybuildIngWest/putactivitysignup")
    R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO);
    /**
     * 获取党建活动所有参入人员的id集合
     *
     * @param id
     *            党建活动id
     * @return 人员id集合
     */
    @PostMapping("/partybuildIngWest/selectallpartybuildingactivitymembers")
    R selectAllPartyBuildingActivityMembers(@RequestParam("id") Long id);
    /**
     * 定时任务刷新党建动态发布状态
     *
     * @return 刷新数据数量
     */
    @PostMapping("/partybuildIngWest/timedtaskpartybuildingstatus")
    R timedTaskPartyBuildingStatus();
    /**
     * 定时任务取消党建活动
     *
     * @return 需要取消的所有党建活动
     */
    @PostMapping("/partybuildIngWest/timedtaskpartybuildingactivity")
    R timedTaskPartyBuildingActivity();
    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     *
     * @return 修改结果
     */
    @PostMapping("/partybuildIngWest/timedtaskpartybuildingactivityall")
    R timedTaskPartyBuildingActivityAll();
    /**
     * 新增服务团队人员
     *
     * @param comPbServiceTeamDTO
     *            新增内容
     * @return 新增结果
     */
    @PostMapping("/partybuildIngWest/addserviceteam")
    R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
    /**
     * 编辑团队人员
     *
     * @param comPbServiceTeamDTO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIngWest/putserviceteam")
    R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
    /**
     * 删除服务团队人员
     *
     * @param comPbServiceTeamDTO
     *            删除主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIngWest/deleteserviceteam")
    R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
    /**
     * 分页查询服务团队成员
     *
     * @param pageComPbServiceTeamDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("/partybuildIngWest/pageserviceteam")
    R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
    /**
     * 创建党员活动 小程序创建党员活动
     *
     * @param comPbActivityDTO
     *            创建内容
     * @return 创建结果
     */
    @PostMapping("/partybuildIngWest/addactivityinfo")
    R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);
    /**
     * 查询用户党员认证信息
     *
     * @param id
     * @param communityId
     *            用户ID
     * @return 查询结果
     */
    @GetMapping("/partybuildIngWest/usercertification")
    R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId);
    /**
     * 查询待认证党员信息
     *
     * @param pagePartyBuildingMemberVO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("/partybuildIngWest/pageusercertification")
    R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
    /**
     * 根据身份证号码查询党员信息
     *
     * @param idCard
     *            身份证号码
     * @return 党员信息
     */
    @PostMapping("/partybuildIngWest/getPartyBuildingByIdCard")
    R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard);
    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIngWest/listpartyorganizationByApp")
    R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO);
    /**
     * 根据id删除党员认证
     *
     * @param id
     *            党员认证id
     * @return 党员认证id
     */
    @PostMapping("/partybuildIngWest/deleteprepartybuildingmember")
    R deleteprepartybuildingmember(@RequestParam("id") Long id);
    /**
     * 导出党员信息
     *
     * @param organizationVO
     *            请求参数
     * @return 党员信息列表
     */
    @PostMapping("/partybuildIngWest/exportPbMember")
    R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
    /**
     * 选择人员
     *
     * @param param
     *            查询条件
     * @param communityId
     *            社区id
     * @return 查询结果
     */
    @PostMapping("/partybuildIngWest/getTotlePerson")
    R getTotlePerson(@RequestParam(value = "param", required = false) String param,
        @RequestParam(value = "communityId") Long communityId);
    /**
     * 根据党员活动id查询活动下报名人员
     *
     * @param activityId
     *            党员活动id
     * @return 活动下报名人员
     */
    @PostMapping("/partybuildIngWest/getTaskPbActivityPeopleList")
    R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);
    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/partybuildIngWest/pageDataStatisticsMember")
    R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @PostMapping("/partybuildIngWest/getOrgDataStatistics")
    R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto);
    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    @GetMapping("/partybuildIngWest/getHeaderOrgDataStatistics")
    R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);
    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    @PostMapping("/partybuildIngWest/exportDataStatisticsMember")
    R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
    /**
     * 党委导入接口
     * @param memberRoleExcelVoList 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/partybuildIngWest/importPbMemberRole")
    R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
    /**
     * 身份证查询是否党员
     * @param idCard
     * @return
     */
    @GetMapping("/partybuildIngWest/checkMember")
    R checkMember(@RequestParam("idCard")String idCard);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
@@ -27,7 +27,7 @@
     * @return 单条数据
     */
    @GetMapping("/comPropertyRepair/{id}")
    R comPropertyRepairSelectOne(@PathVariable("id") Integer id);
    R comPropertyRepairSelectOne(@PathVariable("id") Long id);
    /**
     * 新增数据
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -539,7 +539,7 @@
     * @return 协议内容
     */
    @PostMapping("useragreement")
    R userAgreement(@RequestParam("type") int type);
    R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
    /**
     * uu洗车登录
@@ -700,7 +700,7 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    R agreement(@RequestParam("type") Integer type);
    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
    /**
     * 维护用户最后登录时间
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java
New file
@@ -0,0 +1,94 @@
package com.panzhihua.common.utlis;
import com.panzhihua.common.exceptions.FileSizeLimitExceededException;
import com.panzhihua.common.exceptions.InvalidExtensionException;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import java.util.Objects;
/**
 * 文件上传工具类
 *
 * @author
 */
public class FileTypeUploadUtils {
    /**
     * 默认大小 50M
     */
    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
    /**
     * 默认的文件名最大长度 100
     */
    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
    /**
     * 文件大小校验
     *
     * @param file 上传的文件
     * @return
     * @throws FileSizeLimitExceededException 如果超出最大大小
     * @throws InvalidExtensionException
     */
    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
            throws FileSizeLimitExceededException, InvalidExtensionException {
        long size = file.getSize();
        if (size > DEFAULT_MAX_SIZE) {
            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
        }
        String fileName = file.getOriginalFilename();
        String extension = getExtension(file);
        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
                        fileName);
            } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
                        fileName);
            } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
                        fileName);
            } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
                        fileName);
            } else {
                throw new InvalidExtensionException(allowedExtension, extension, fileName);
            }
        }
    }
    /**
     * 判断MIME类型是否是允许的MIME类型
     *
     * @param extension
     * @param allowedExtension
     * @return
     */
    public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
        for (String str : allowedExtension) {
            if (str.equalsIgnoreCase(extension)) {
                return true;
            }
        }
        return false;
    }
    /**
     * 获取文件名的后缀
     *
     * @param file 表单文件
     * @return 后缀名
     */
    public static final String getExtension(MultipartFile file) {
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        if (StringUtils.isEmpty(extension)) {
            extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
        }
        return extension;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java
New file
@@ -0,0 +1,59 @@
package com.panzhihua.common.utlis;
/**
 * 媒体类型工具类
 *
 * @author
 */
public class MimeTypeUtils
{
    public static final String IMAGE_PNG = "image/png";
    public static final String IMAGE_JPG = "image/jpg";
    public static final String IMAGE_JPEG = "image/jpeg";
    public static final String IMAGE_BMP = "image/bmp";
    public static final String IMAGE_GIF = "image/gif";
    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
    public static final String[] FLASH_EXTENSION = { "swf", "flv" };
    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
            "asf", "rm", "rmvb" };
    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
            // 图片
            "bmp", "gif", "jpg", "jpeg", "png",
            // word excel powerpoint
            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
            // 压缩文件
            "rar", "zip", "gz", "bz2",
            // 视频格式
            "mp4", "avi", "rmvb",
            // pdf
            "pdf" };
    public static String getExtension(String prefix)
    {
        switch (prefix)
        {
            case IMAGE_PNG:
                return "png";
            case IMAGE_JPG:
                return "jpg";
            case IMAGE_JPEG:
                return "jpeg";
            case IMAGE_BMP:
                return "bmp";
            case IMAGE_GIF:
                return "gif";
            default:
                return "";
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java
@@ -7,6 +7,9 @@
import java.util.Map;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysAppConfigVO;
import com.panzhihua.common.service.user.UserService;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -41,6 +44,7 @@
    private RedisTemplate redisTemplate;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    UserService userService;
    private static WxXCXTempSend wxXCXTempSend;
    /**
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java
@@ -46,7 +46,8 @@
    @ApiOperation(value = "查询社区动态分类列表", response = ComActDynTypeVO.class)
    @PostMapping("/list")
    public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        comActDynTypeDTO.setCommunityId(this.getCommunityId());
        Long communityId = this.getCommunityId();
        comActDynTypeDTO.setCommunityId(communityId);
        return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
@@ -132,6 +132,7 @@
        PagePartyOrganizationVO pagePartyOrganizationVO = new PagePartyOrganizationVO();
        BeanUtils.copyProperties(pagePartyOrganizationMemberVO, pagePartyOrganizationVO);
        pagePartyOrganizationVO.setCommunityId(id);
        pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -4,8 +4,13 @@
import javax.annotation.Resource;
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;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -542,7 +547,7 @@
    @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
    @GetMapping("/list/act")
    public R list() {
        return communityService.communitySwitchList(this.getAreaCode());
        return communityService.communitySwitchList(this.getAppId());
    }
    @ApiOperation(value = "清网治格-根据事件分类获取近1月的社区事件数据", response = EventGridIncidentStatisticsVO.class)
@@ -678,4 +683,57 @@
    public R getCourtyardBaseData() {
        return communityService.getCourtyardBaseData(this.getCommunityId());
    }
    @ApiOperation(value = "孵化中心-基础数据", response = BigScreenHatchStatisticsInfo.class)
    @GetMapping("/hatch/base")
    public R getHatchBaseData() {
        return communityService.getHatchBaseData(this.getCommunityId());
    }
    @ApiOperation(value = "孵化中心-孵化成果展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/hatchResult/list")
    public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageHatchResult(pageBaseDTO);
    }
    @ApiOperation(value = "孵化中心-孵化进度展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/hatchSchedule/list")
    public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageHatchSchedule(pageBaseDTO);
    }
    @ApiOperation(value = "五社联动基础数据", response = BigScreenFiveAssociationsStatisticsInfo.class)
    @GetMapping("/fiveAssociations/base")
    public R getFiveAssociationsBaseData() {
        return communityService.getFiveAssociationsBaseData(this.getCommunityId());
    }
    @ApiOperation(value = "五社联动项目展示列表", response = SocialProjectVO.class)
    @PostMapping("/socialProject/list")
    public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageSocialProjectList(pageBaseDTO);
    }
    @ApiOperation(value = "五社联动社会组织展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/socialOrg/list")
    public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageSocialOrgList(pageBaseDTO);
    }
    @ApiOperation(value = "人大代表", response = BigScreenDpcStatisticsInfo.class)
    @GetMapping("/dpc/base")
    public R dpcBase() {
        return communityService.dpcBase(this.getCommunityId());
    }
    @ApiOperation(value = "人大代表-随手拍展示列表", response = ComActEasyPhotoVO.class)
    @PostMapping("/dpc/easyPhotoList")
    public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.dpcEasyPhotoList(pageBaseDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java
New file
@@ -0,0 +1,83 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@Api(tags = {"人大代表相关"})
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation("新增人大代表")
    @PostMapping("/add")
    public R addDpc(@RequestBody @Valid AddDpcDTO addDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addDpcDTO.setCreatedBy(loginUserInfo.getUserId());
        addDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
        addDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.addDpc(addDpcDTO);
    }
    @ApiOperation("修改人大代表")
    @PostMapping("/edit")
    public R editDpc(@RequestBody @Valid EditDpcDTO editDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editDpc(editDpcDTO);
    }
    @ApiOperation("删除人大代表")
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @DeleteMapping("/delete")
    public R deleteDpc(@RequestParam("id") Long id) {
        return communityService.deleteDpc(id);
    }
    @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return communityService.detailDpc(id);
    }
    @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
    @PostMapping("/page")
    public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageDpc(pageDpcDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java
New file
@@ -0,0 +1,93 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.nonNull;
/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@Api(tags = {"社区企业管理"})
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation("新增社区企业")
    @PostMapping("/add")
    public R addEnterprise(@RequestBody @Valid AddEnterpriseDTO addEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addEnterpriseDTO.setCreatedBy(loginUserInfo.getUserId());
        addEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addEnterprise(addEnterpriseDTO);
    }
    @ApiOperation("修改社区企业")
    @PostMapping("/edit")
    public R editEnterprise(@RequestBody @Valid EditEnterpriseDTO editEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editEnterprise(editEnterpriseDTO);
    }
    @ApiOperation("删除社区企业")
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @DeleteMapping("/delete")
    public R deleteEnterprise(@RequestParam("id") Long id) {
        return communityService.deleteEnterprise(id);
    }
    @ApiOperation(value = "获取社区企业详情", response = ComActEnterpriseVO.class)
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return communityService.detailEnterprise(id);
    }
    @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (nonNull(loginUserInfo.getStreetId())) {
            pageEnterpriseDTO.setStreetId(loginUserInfo.getStreetId());
        } else {
            pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
        }
        return communityService.pageEnterprise(pageEnterpriseDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java
New file
@@ -0,0 +1,97 @@
package com.panzhihua.community_backstage.api;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActEnterpriseTypeApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类管理
 * @author: hans
 * @date: 2022/06/06 15:47
 */
@Slf4j
@Api(tags = {"社区企业服务分类管理"})
@RestController
@RequestMapping("/enterpriseType")
public class ComActEnterpriseTypeApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation("新增服务分类")
    @PostMapping("/add")
    public R addEnterpriseType(@RequestBody @Valid AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addEnterpriseTypeDTO.setCreatedBy(loginUserInfo.getUserId());
        addEnterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        addEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.addEnterpriseType(addEnterpriseTypeDTO);
    }
    @ApiOperation("修改服务分类")
    @PostMapping("/edit")
    public R editEnterpriseType(@RequestBody @Valid EditEnterpriseTypeDTO enterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        enterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        enterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.editEnterpriseType(enterpriseTypeDTO);
    }
    @ApiOperation("删除服务分类")
    @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
    @DeleteMapping("/delete")
    public R deleteEnterpriseType(@RequestParam("id") Long id) {
        return communityService.deleteEnterpriseType(id);
    }
    @ApiOperation(value = "获取服务分类详情", response = ComActEnterpriseTypeVO.class)
    @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
    @GetMapping("/detail")
    public R detailEnterpriseType(@RequestParam("id") Long id) {
        return communityService.detailEnterpriseType(id);
    }
    @ApiOperation(value = "分页查询服务分类", response = ComActEnterpriseTypeVO.class)
    @PostMapping("/page")
    public R pageEnterpriseType(@RequestBody @Valid PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        pageEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageEnterpriseType(pageEnterpriseTypeDTO);
    }
    @ApiOperation(value = "获取服务分类列表", response = ComActEnterpriseTypeVO.class)
    @GetMapping("/list")
    public R getEnterpriseTypeList() {
        return communityService.getEnterpriseTypeList(this.getCommunityId());
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java
@@ -51,7 +51,7 @@
     */
    @ApiOperation(value ="通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActFourMemberSelectOne(id);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -40,8 +41,11 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        commonPage.setUserType(loginUserInfo.getUserType());
        commonPage.setUserId(loginUserInfo.getUserId());
        if(loginUserInfo.getStreetId()!=null){
            commonPage.setStreetId(loginUserInfo.getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchApi.java
New file
@@ -0,0 +1,74 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActSocialOrgHatchApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化相关
 * @author: hans
 * @date: 2022/04/18 16:57
 */
@Slf4j
@Api(tags = {"社会组织孵化"})
@RestController
@RequestMapping("/comActSocialOrgHatch")
public class ComActSocialOrgHatchApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "分页查询孵化数据", response = SocialOrgHatchVO.class)
    @PostMapping("/page")
    public R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO) {
        return communityService.pageOrgHatch(pageHatchDTO);
    }
    @ApiOperation(value = "查看孵化数据详情", response = SocialOrgHatchVO.class)
    @ApiImplicitParam(name = "id", value = "孵化id", required = true)
    @GetMapping("/detail")
    public R detailOrgHatch(@RequestParam("id") Long id) {
        return communityService.detailOrgHatch(id);
    }
    @ApiOperation(value = "修改孵化状态")
    @PutMapping("/update/{id}/{status}")
    public R updateOrgHatchStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status) {
        return communityService.updateOrgHatchStatus(id, status);
    }
    @ApiOperation(value = "删除孵化数据")
    @ApiImplicitParam(name = "id", value = "孵化id", required = true)
    @GetMapping("/delete")
    public R deleteOrgHatch(@RequestParam("id") Long id) {
        return communityService.deleteOrgHatch(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchAuditApi.java
New file
@@ -0,0 +1,85 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActSocialOrgHatchAuditApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请相关
 * @author: hans
 * @date: 2022/04/18 14:14
 */
@Slf4j
@Api(tags = {"社会组织孵化申请"})
@RestController
@RequestMapping("/comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "分页查询孵化申请", response = SocialOrgHatchAuditVO.class)
    @PostMapping("/page")
    public R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        return communityService.pageHatchAudit(pageHatchAuditDTO);
    }
    @ApiOperation(value = "查看孵化申请详情", response = SocialOrgHatchAuditVO.class)
    @ApiImplicitParam(name = "id", value = "孵化申请id", required = true)
    @GetMapping("/detail")
    public R detailHatchAudit(@RequestParam("id") Long id) {
        return communityService.detailHatchAudit(id);
    }
    @ApiOperation(value = "修改孵化申请")
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody @Validated(PutGroup.class) SocialOrgHatchAuditDTO hatchAuditDTO) {
        return communityService.updateHatchAudit(hatchAuditDTO);
    }
    @ApiOperation(value = "获取孵化流程配置", response = String.class)
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return communityService.getHatchAuditProcess();
    }
    @ApiOperation(value = "修改孵化流程配置")
    @PutMapping("/process")
    public R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO) {
        return communityService.putHatchAuditProcess(processDTO);
    }
    @ApiOperation(value = "删除孵化申请")
    @ApiImplicitParam(name = "id", value = "孵化申请id", required = true)
    @GetMapping("/delete")
    public R deleteHatchAudit(@RequestParam("id") Long id) {
        return communityService.deleteHatchAudit(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java
@@ -2,8 +2,11 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
@@ -14,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Date;
/**
@@ -42,10 +46,12 @@
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        commonPage.setUserType(loginUserInfo.getUserType());
        commonPage.setUserId(loginUserInfo.getUserId());
        if(loginUserInfo.getStreetId()!=null){
            commonPage.setStreetId(loginUserInfo.getStreetId());
        } else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return communityService.selectAllComActSocialProject(commonPage);
@@ -60,7 +66,7 @@
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
        return communityService.selectOneComActSocialProject(id);
    }
    /**
     * 根据项目id分页获取关联项目
@@ -119,4 +125,10 @@
        return communityService.deleteComActSocialProject(id);
    }
    @ApiOperation(value = "分页查询项目报名列表", response = ComActSocialOrgVO.class)
    @PostMapping("signList")
    public R pageProjectSignList(@RequestBody @Valid PageProjectSignListDTO pageProjectSignListDTO) {
        return communityService.pageProjectSignList(pageProjectSignListDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
@@ -25,7 +26,7 @@
@Api(tags = {"项目宣传管理"})
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi {
public class ComActSocialProjectPublicityApi extends BaseController {
    /**
     * 服务对象
     */
@@ -65,6 +66,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        comActSocialProjectPublicityVO.setReleaseName(this.getLoginUserInfo().getName());
        return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java
@@ -19,6 +19,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComFmsApi.java
@@ -153,9 +153,9 @@
    @ApiOperation("新增团队")
    @PostMapping("/team/add")
    public R addFmsTeam(@RequestBody @Valid AddTeamDTO addTeamDTO) {
        if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamDTO.setCreatedBy(loginUserInfo.getUserId());
@@ -166,9 +166,9 @@
    @ApiOperation("修改团队信息")
    @PostMapping("/team/edit")
    public R editFmsTeam(@RequestBody @Valid EditTeamDTO editTeamDTO) {
        if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamDTO.setUpdatedBy(loginUserInfo.getUserId());
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java
@@ -88,7 +88,7 @@
     */
    @ApiOperation("详情接口")
    @GetMapping("/{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.propertyService.comPropertyRepairSelectOne(id);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -909,4 +909,41 @@
        return communityService.getDistrictByCityCode(cityAdcode);
    }
    @ApiOperation(value = "获取树结构区域信息")
    @GetMapping(value = "arealist")
    public R getAllArea(@ApiParam(name = "省份:四川510000",
            required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
    }
    @ApiOperation(value = "社区详情", response = ComActVO.class)
    @ApiImplicitParam(name = "id", value = "社区id", required = true)
    @GetMapping("community")
    public R detailCommunity(@RequestParam("id") Long id) {
        return communityService.detailCommunity(id);
    }
    @ApiOperation(value = "街道详情", response = ComStreetVO.class)
    @ApiImplicitParam(name = "id", value = "街道id", required = true)
    @GetMapping("street")
    public R detailStreet(@RequestParam("id") Long id) {
        return communityService.detailStreet(id);
    }
    @ApiOperation(value = "查询街道", response = ComStreetVO.class)
    @PostMapping("liststreet")
    public R listStreet(@RequestBody ComStreetVO comStreetVO) {
        return communityService.listStreet(comStreetVO);
    }
    @ApiOperation("编辑社区")
    @PutMapping("community")
    public R putCommunity(@RequestBody ComActVO comActVO) {
        Long communityId = comActVO.getCommunityId();
        if (null == communityId || 0 == communityId) {
            return R.fail("社区主键不能为空");
        }
        return communityService.putCommunity(comActVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -119,9 +119,13 @@
    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        Long communityId = this.getCommunityId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = null;
        if (isNull(loginUserInfo.getStreetId())) {
            communityId = this.getCommunityId();
        }
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
        comActActivityVO.setUserId(loginUserInfo.getUserId());
        return communityService.addActivity(comActActivityVO);
    }
@@ -132,7 +136,11 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        Long communityId = this.getCommunityId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = null;
        if (isNull(loginUserInfo.getStreetId())) {
            communityId = this.getCommunityId();
        }
        ComActActivityVO.setCommunityId(communityId);
        return communityService.putActivity(ComActActivityVO);
    }
@@ -149,11 +157,14 @@
    @ApiOperation(value = "分页查询社区活动")
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        Long projectId = comActActivityVO.getProjectId();
        if (isNull(projectId)) {
            Long communityId = this.getCommunityId();
            comActActivityVO.setCommunityId(communityId);
        }
        // return communityService.pageActivity(ComActActivityVO);
        return communityService.pageActivityCommunityBack(ComActActivityVO);
        return communityService.pageActivityCommunityBack(comActActivityVO);
    }
    @ApiOperation(value = "发布活动")
@@ -739,6 +750,10 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        Integer category = comActDynVO.getCategory();
        if (isNull(category)) {
            comActDynVO.setCategory(1);
        }
        return communityService.pageDynamicByAdmin(comActDynVO);
    }
@@ -1286,6 +1301,11 @@
        }
        return R.fail("未查询到用户");
    }
    @ApiOperation(value = "批量删除活动")
    @PostMapping("delete")
    public R deleteActivities(@RequestBody List<Long> ids) {
        return communityService.deleteActivities(ids);
    }
    @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
    @GetMapping("/analysis")
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -14,6 +14,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.MimeTypeUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.util.BaseUtils;
import lombok.Data;
@@ -58,6 +59,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
 * @description: 社区便民服务商家接口
@@ -204,6 +207,7 @@
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
@@ -240,6 +244,7 @@
    @PostMapping(value = "/minio/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R minipuploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            log.info("开始上传文件" + DateUtils.getCurrentDateStr_MS());
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -25,6 +25,8 @@
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.partybuilding.ComDataStatisticsFeign;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.community_backstage.config.MinioUtil;
import com.panzhihua.community_backstage.config.SFTPConfig;
import org.apache.commons.io.FilenameUtils;
@@ -73,6 +75,9 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
import static java.util.Objects.nonNull;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区党建引领
@@ -87,6 +92,8 @@
    private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private CommunityService communityService;
    @Resource
@@ -255,6 +262,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
@@ -296,6 +304,7 @@
    @PostMapping("exportPartyMember")
    public R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        String url = userurl;
        String name = "党员时长信息数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
@@ -531,7 +540,7 @@
        if (l >= time) {
            partyCommitteeVO.setStatus(2);
        }
        return partyBuildingService.adddYnamic(partyCommitteeVO);
        return partyBuildingWestService.adddYnamic(partyCommitteeVO);
    }
    @ApiOperation(value = "编辑动态/政策文件")
@@ -541,13 +550,13 @@
        if (null == id || 0 == id) {
            return R.fail("动态主键不能为空");
        }
        return partyBuildingService.updateYnamic(partyCommitteeVO);
        return partyBuildingWestService.updateYnamic(partyCommitteeVO);
    }
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        return partyBuildingService.infoYnamic(id);
        return partyBuildingWestService.infoYnamic(id);
    }
    @ApiOperation(value = "分页查询党员动态/政策文件", response = PartyCommitteeVO.class)
@@ -559,7 +568,7 @@
        }
        Long communityId = this.getCommunityId();
        partyBuildingComPbDynVO.setCommunityId(communityId);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }
    @ApiOperation(value = "删除动态/政策文件")
@@ -569,7 +578,7 @@
        if (null == id || 0 == id) {
            return R.fail("动态主键不能为空");
        }
        return partyBuildingService.deleteYnamic(id);
        return partyBuildingWestService.deleteYnamic(id);
    }
    //@OperLog(operModul = "党员管理", operType = 3)
@@ -587,6 +596,7 @@
    @PostMapping("serviceteam")
    public R addServiceTeam(@RequestBody @Validated(AddGroup.class) ComPbServiceTeamDTO comPbServiceTeamDTO) {
        comPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        comPbServiceTeamDTO.setAppid(this.getAppId());
        return partyBuildingService.addServiceTeam(comPbServiceTeamDTO);
    }
@@ -597,6 +607,7 @@
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        comPbServiceTeamDTO.setAppid(this.getAppId());
        comPbServiceTeamDTO.setCommunityId(null);
        return partyBuildingService.putServiceTeam(comPbServiceTeamDTO);
    }
@@ -608,13 +619,18 @@
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        comPbServiceTeamDTO.setAppid(this.getAppId());
        return partyBuildingService.deleteServiceTeam(comPbServiceTeamDTO);
    }
    @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        if(nonNull(this.getLoginUserInfo().getStreetId())) {
            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingWestApi.java
New file
@@ -0,0 +1,1044 @@
package com.panzhihua.community_backstage.api;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.panzhihua.common.listen.ComPbMemberRoleExcelListen;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.PartyMemberListExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.partybuilding.ComDataStatisticsFeign;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.community_backstage.config.MinioUtil;
import com.panzhihua.community_backstage.config.SFTPConfig;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.UploadFilesVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.user.RoleVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen;
import com.panzhihua.community_backstage.model.dto.PartyBuildingMemberDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
import static java.util.Objects.nonNull;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区党建引领
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 09:45
 **/
@Slf4j
@Api(tags = {"社区党建引领"})
@RestController
@RequestMapping("/communitypartybuildingWest/")
public class CommunityPartyBuildingWestApi extends BaseController {
    private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @Value("${excel.url}")
    private String excelUrl = "http://panzhihua.nhys.cdnhxx.com/web/";
    @Value("${excel.userurl}")
    private String userurl;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Resource
    private SFTPConfig sftpConfig;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private MinioUtil minioUtil;
    @Resource
    private ComDataStatisticsFeign dataStatisticsService;
    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganization")
    public R listPartyOrganization() {
        Long communityId = this.getCommunityId();
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingWestService.listPartyOrganization(communityId);
    }
    @ApiOperation(value = "分页查询社区所有党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingWestService.listPartyOrganizationAll(partyOrganizationVO);
    }
    @ApiOperation(value = "查询社区所有党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("getPbOrgAllList")
    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingWestService.getPbOrgAllList(partyOrganizationVO);
    }
    @OperLog(operModul = "党支部管理", operType = 1)
    @ApiOperation(value = "新增党支部")
    @PostMapping("addpartyorganization")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        R r = partyBuildingWestService.addPartyOrganization(partyOrganizationVO);
        return r;
    }
    @OperLog(operModul = "党支部管理", operType = 2)
    @ApiOperation(value = "编辑党支部")
    @PostMapping("updatepartyorganization")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long id = partyOrganizationVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党支部id不能为空");
        }
        return partyBuildingWestService.updatePartyOrganization(partyOrganizationVO);
    }
    @OperLog(operModul = "党支部管理", operType = 3)
    @ApiOperation(value = "启用、禁用党支部")
    @PutMapping("resetpartyorganization")
    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long id = partyOrganizationVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党支部id不能为空");
        }
        Integer status = partyOrganizationVO.getStatus();
        if (null == status || (status != 1 && status != 2)) {
            return R.fail("输入有效的状态,1:启用,2:禁用");
        }
        return partyBuildingWestService.resetPartyOrganization(partyOrganizationVO);
    }
    @OperLog(operModul = "党支部管理", operType = 4)
    @ApiOperation(value = "删除党支部")
    @DeleteMapping("deletepartyorganization")
    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long id = partyOrganizationVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党支部id不能为空");
        }
        return partyBuildingWestService.deletePartyOrganization(partyOrganizationVO);
    }
    @OperLog(operModul = "党员管理", operType = 1)
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long communityId = this.getCommunityId();
        partyBuildingMemberVO.setCommunityId(communityId);
        R r = partyBuildingWestService.addPartyBuildingMember(partyBuildingMemberVO);
        if (R.isOk(r)) {
            R r1 = userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard());
        }
        return r;
    }
    @OperLog(operModul = "党员管理", operType = 2)
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long id = partyBuildingMemberVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党员id不能为空");
        }
        return partyBuildingWestService.updatePartyBuildingMember(partyBuildingMemberVO);
    }
    @ApiOperation(value = "下载模板-导入党员")
    @GetMapping(value = "downloadtemplate")
    public R downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
        return R.ok(excelUrl);
    }
    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        String name = file.getOriginalFilename();
        List<String> formateList = Arrays.asList("avi", "flv", "mpg", "mpeg", "mpe", "m1v", "m2v", "mpv2", "mp2v",
                "dat", "ts", "tp", "tpr", "pva", "pss", "mp4", "m4v", "m4p", "m4b", "3gp", "3gpp", "3g2", "3gp2", "ogg",
                "mov", "qt", "amr", "rm", "ram", "rmvb", "rpm");
        String nameStr = name.split("\\.")[1];
        if (formateList.contains(nameStr)) {
            name = UUID.randomUUID().toString().replaceAll("-", "") + ".mp4";
        } else {
            name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
        }
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(url + "/idcard/" + name);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
        }
    }
    @ApiOperation(value = "新上传照片接口")
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
            return R.ok(imageUrl);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
        }
    }
//    @ApiOperation(value = "批量新增党员导入excel")
//    @PostMapping(value = "downloadtemplate", consumes = "multipart/*", headers = "content-type=multipart/form-date")
//    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
//        String fileName = file.getOriginalFilename(); // 获取文件名
//        log.info("传入文件名字【{}】", fileName);
//        InputStream inputStream = null;
//        try {
//            inputStream = file.getInputStream();
//            EasyExcel.read(inputStream, PartyBuildingMemberExcelVO.class,
//                    new PartyBuildingMemberExcelListen(partyBuildingWestService)).sheet().doRead();
//        } catch (IOException e) {
//            e.printStackTrace();
//            log.error("导入模板失败【{}】", e.getMessage());
//        }
//        return R.ok();
//    }
    @ApiOperation(value = "党员管理分页查询", response = PartyBuildingMemberVO.class)
    @PostMapping("pagepartyorganization")
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        //pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        return partyBuildingWestService.pagePartyOrganization(pagePartyOrganizationVO);
    }
    @ApiOperation(value = "党员时长信息导出", response = PartyBuildingMemberVO.class)
    @PostMapping("exportPartyMember")
    public R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        String url = userurl;
        String name = "党员时长信息数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        // 用户搜索了就下载搜索的用户否则下载所有用户
        R r = partyBuildingWestService.exportPartyMember(pagePartyOrganizationVO);
        if (R.isOk(r)) {
            List<PartyMemberListExcelVO> eexcelUserDTOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyMemberListExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, PartyMemberListExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员时长信息数据导出").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }
    @ApiOperation(value = "党员档案--党员活动", response = PartyBuildingActivityVO.class)
    @PostMapping("listpartymemberactivities")
    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return partyBuildingWestService.listPartyMemberActivities(partyBuildingActivityVO);
    }
    @ApiOperation(value = "活动报名名单分页查询", response = PageActivityMembersVO.class)
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
        return partyBuildingWestService.pageActivityMembers(pageActivityMembersVO);
    }
    @ApiOperation(value = "活动详情", response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        return partyBuildingWestService.activityinfo(id, userId);
    }
    @ApiOperation(value = "新增党员活动")
    @PostMapping("addactivity")
    public R addActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        partyBuildingActivityVO.setCommunityId(communityId);
        partyBuildingActivityVO.setCreateBy(userId);
        return partyBuildingWestService.addactivity(partyBuildingActivityVO);
    }
    @ApiOperation(value = "编辑党员活动")
    @PutMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (null == id || 0 == id) {// todo 修改报名人数 最低人数 0 的判断
            return R.fail("主键不能为空");
        }
        return partyBuildingWestService.updateActivity(partyBuildingActivityVO);
    }
    @ApiOperation(value = "发布党员活动")
    @PutMapping("releaseactivity")
    public R releaseActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        return partyBuildingWestService.releaseActivity(id);
    }
    @ApiOperation(value = "删除党员活动")
    @DeleteMapping("deleteactivity")
    public R deleteActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        return partyBuildingWestService.deleteActivity(id);
    }
    @ApiOperation(value = "取消党员活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        String cancelReason = partyBuildingActivityVO.getCancelReason();
        boolean emptycancelReason = ObjectUtils.isEmpty(cancelReason);
        boolean emptyid = ObjectUtils.isEmpty(id);
        if (emptycancelReason || emptyid) {
            return R.fail("参数不全");
        }
        R r = partyBuildingWestService.cancelActivity(partyBuildingActivityVO);
        if (R.isOk(r)) {
            R r1 = partyBuildingWestService.selectAllPartyBuildingActivityMembers(id);
            if (R.isOk(r1)) {
                List<Long> userIds = JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), Long.class);
                userIds.forEach(aLong -> {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(aLong);
                    sysUserNoticeVO.setType(1);
                    sysUserNoticeVO.setTitle("活动因故取消");
                    sysUserNoticeVO.setBusinessType(2);
                    sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
                    sysUserNoticeVO
                            .setBusinessContent(String.format("取消原因%s", partyBuildingActivityVO.getCancelReason()));
                    sysUserNoticeVO.setBusinessId(id);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(1);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增取消党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                });
            }
        }
        return r;
    }
    @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long CommunityId = this.getCommunityId();
        partyBuildingActivityVO.setCommunityId(CommunityId);
        return partyBuildingWestService.pageActivity(partyBuildingActivityVO);
    }
    @ApiOperation(value = "社区下拉选择党员", response = PartyBuildingMemberVO.class)
    @GetMapping("listpartymember")
    public R listPartyMember() {
        Long communityId = this.getCommunityId();
        return partyBuildingWestService.listPartyMember(communityId);
    }
    @ApiOperation(value = "社区下拉选择身份", response = RoleVO.class)
    @GetMapping("listidentity")
    public R listIdentity() {
        Long communityId = this.getCommunityId();
        return userService.listIdentity(communityId);
    }
    @OperLog(operModul = "党委管理", operType = 1)
    @ApiOperation(value = "新增党委")
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) {
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingWestService.addPartyCommittee(partyCommitteeVO);
        if (R.isOk(r)) {
            R r1 = userService.updateUserIsPartymember(partyCommitteeVO.getIdCard());
        }
        return r;
    }
    @OperLog(operModul = "党委管理", operType = 2)
    @ApiOperation(value = "编辑党委")
    @PutMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) {
        Long id = partyCommitteeVO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        return partyBuildingWestService.updatePartyCommittee(partyCommitteeVO);
    }
    @OperLog(operModul = "党委管理", operType = 3)
    @ApiOperation(value = "删除党委")
    @DeleteMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        Long id = partyCommitteeVO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        return partyBuildingWestService.deletePartyCommittee(partyCommitteeVO);
    }
    @ApiOperation(value = "分页党委查询", response = PartyCommitteeVO.class)
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        return partyBuildingWestService.pagePartyCommittee(partyCommitteeVO);
    }
    @ApiOperation(value = "新建动态/政策文件")
    @PostMapping("adddynamic")
    public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        partyCommitteeVO.setCreateBy(loginUserInfo.getUserId());
        partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
        Date publishAt = partyCommitteeVO.getPublishAt();
        if (null == publishAt) {
            publishAt = new Date();
            partyCommitteeVO.setPublishAt(publishAt);
        }
        long time = publishAt.getTime();
        long l = System.currentTimeMillis();
        if (l >= time) {
            partyCommitteeVO.setStatus(2);
        }
        return partyBuildingWestService.adddYnamic(partyCommitteeVO);
    }
    @ApiOperation(value = "编辑动态/政策文件")
    @PutMapping("updatedynamic")
    public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        Long id = partyCommitteeVO.getId();
        if (null == id || 0 == id) {
            return R.fail("动态主键不能为空");
        }
        return partyBuildingWestService.updateYnamic(partyCommitteeVO);
    }
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        return partyBuildingWestService.infoYnamic(id);
    }
    @ApiOperation(value = "分页查询党员动态/政策文件", response = PartyCommitteeVO.class)
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Integer type = partyBuildingComPbDynVO.getType();
        if (null == type || 0 == type) {
            return R.fail("类型不能为空");
        }
        Long communityId = this.getCommunityId();
        partyBuildingComPbDynVO.setCommunityId(communityId);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }
    @ApiOperation(value = "删除动态/政策文件")
    @DeleteMapping("deletedynamic")
    public R deleteYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Long id = partyBuildingComPbDynVO.getId();
        if (null == id || 0 == id) {
            return R.fail("动态主键不能为空");
        }
        return partyBuildingWestService.deleteYnamic(id);
    }
    @OperLog(operModul = "党员管理", operType = 3)
    @ApiOperation(value = "删除党员")
    @DeleteMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long id = partyBuildingMemberVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党员主键不能为空");
        }
        return partyBuildingWestService.deleteDynUser(id);
    }
    @ApiOperation(value = "新增服务团队人员")
    @PostMapping("serviceteam")
    public R addServiceTeam(@RequestBody @Validated(AddGroup.class) ComPbServiceTeamDTO comPbServiceTeamDTO) {
        comPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        return partyBuildingWestService.addServiceTeam(comPbServiceTeamDTO);
    }
    @ApiOperation(value = "编辑服务团队人员")
    @PutMapping("serviceteam")
    public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) {
        Long id = comPbServiceTeamDTO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        comPbServiceTeamDTO.setCommunityId(null);
        return partyBuildingWestService.putServiceTeam(comPbServiceTeamDTO);
    }
    @ApiOperation(value = "删除服务团队人员")
    @DeleteMapping("serviceteam")
    public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) {
        Long id = comPbServiceTeamDTO.getId();
        if (null == id || 0 == id) {
            return R.fail("主键不能为空");
        }
        return partyBuildingWestService.deleteServiceTeam(comPbServiceTeamDTO);
    }
    @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        if(nonNull(this.getLoginUserInfo().getStreetId())) {
            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
        return partyBuildingWestService.pageServiceTeam(pageComPbServiceTeamDTO);
    }
    @ApiOperation(value = "留言-删除")
    @DeleteMapping("deletemessage")
    public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
        return communityWestService.deleteMessage(comActMessageVO);
    }
    @ApiOperation(value = "批量设置留言(公开1,保密2)")
    @DeleteMapping("resetmessagepublic")
    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
        return communityWestService.resetMessagePublic(resetComActMessageVO);
    }
    @ApiOperation(value = "分页显示社区所有的留言", response = ComActMessageVO.class)
    @PostMapping("pagemycommunitymessage")
    public R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        if (null == communityId || 0 == communityId) {
            return R.fail("用户未绑定社区");
        }
        comActMessageVO.setCommunityId(communityId);
        comActMessageVO.setUserId(loginUserInfo.getUserId());
        return communityWestService.pageMyCommunityMessage(comActMessageVO);
    }
    @ApiOperation(value = "待认证党员分页查询", response = PartyBuildingMemberVO.class)
    @PostMapping("pageprepartybuildingmember")
    public R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO) {
        // 待认证党员分页查询
        Long communityId = this.getCommunityId();
        if (communityId != null) {
            pagePartyBuildingMemberVO.setCommunityId(communityId);
        }
        return partyBuildingWestService.pagePrePartybuildingmember(pagePartyBuildingMemberVO);
    }
    @ApiOperation(value = "待认证党员审核")
    @PostMapping("reviewprepartybuildingmember")
    public R reviewPrePartybuildingmember(@RequestBody PartyBuildingMemberDTO partyBuildingMemberDTO) {
        // 待认证党员审核
        PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
        partyBuildingMemberVO.setId(partyBuildingMemberDTO.getId());
        /**
         * 0 待审核 1 已审核 2 自动认证 3 已驳回
         */
        switch (partyBuildingMemberDTO.getType()) {
            case 1:
                partyBuildingMemberVO.setAuditResult(1);
                break;
            case 0:
                partyBuildingMemberVO.setAuditResult(3);
                partyBuildingMemberVO.setRefuseReason(partyBuildingMemberDTO.getRefuseReason());
                break;
            default:
                return R.fail("参数错误");
        }
        R updated = partyBuildingWestService.updatePartyBuildingMember(partyBuildingMemberVO);
        if (R.isOk(updated)) {
            // 审核通过: 修改用户的党员状态
            PartyBuildingMemberVO vo1 =
                    JSONObject.parseObject(JSONObject.toJSONString(updated.getData()), PartyBuildingMemberVO.class);
            //金沙社区特殊需求 添加党员默认添加志愿者
            if(vo1.getCommunityId()==2){
                ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
                comMngVolunteerMngVO.setOrgId(53L);
                comMngVolunteerMngVO.setName(vo1.getName());
                comMngVolunteerMngVO.setPhone(vo1.getPhone());
                comMngVolunteerMngVO.setIdCard(vo1.getIdCard());
                comMngVolunteerMngVO.setState(2);
                comMngVolunteerMngVO.setCommunityId(2L);
                R r = communityWestService.addVolunteer(comMngVolunteerMngVO);
                // 支援者添加成功,修改小程序用户的志愿者状态    ,通过手机号
                if (R.isOk(r)) {
                    String phone = comMngVolunteerMngVO.getPhone();
                    R r1 = userService.putUserIsVolunteer(phone, 1);
                    if (R.isOk(r1)) {
                        log.info("修改手机号【{}】的支援者状态为是", phone);
                    } else {
                        log.info("手机号【{}】没有小程序用户", phone);
                    }
                }
            }
            Long userId = vo1.getUserId();
            Long memId = partyBuildingMemberVO.getId();
            String userIdcard = vo1.getIdCard();
            if ((1 == partyBuildingMemberVO.getAuditResult()) && R.isOk(updated)) {
                R r = userService.updateUserIsPartymember(userIdcard);
                if (R.isOk(r)) {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(userId);
                    sysUserNoticeVO.setType(3);
                    sysUserNoticeVO.setTitle("党员认证申请审核通过");
                    sysUserNoticeVO.setBusinessType(11);
                    sysUserNoticeVO.setBusinessTitle(" ");
                    sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被审核通过");
                    sysUserNoticeVO.setBusinessId(memId);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r1 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r1)) {
                        log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
                R r1 = userService.getUserOpenId(userId);
                if (R.isOk(r1)) {
                    String openid = r1.getData().toString();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                                DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败,失败原因:" + e.getMessage());
                    }
                }
                return r;
            } else if (3 == partyBuildingMemberVO.getAuditResult() && R.isOk(updated)) {
                R r = userService.updateUserNotPartymember(userIdcard);
                if (R.isOk(r)) {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(userId);
                    sysUserNoticeVO.setType(3);
                    sysUserNoticeVO.setTitle("党员认证申请未通过");
                    sysUserNoticeVO.setBusinessType(11);
                    sysUserNoticeVO.setBusinessTitle(" ");
                    sysUserNoticeVO.setBusinessContent("驳回原因:" + partyBuildingMemberVO.getRefuseReason());
                    sysUserNoticeVO.setBusinessId(memId);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(1);
                    R r1 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r1)) {
                        log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                    R r2 = userService.getUserOpenId(userId);
                    if (R.isOk(r2)) {
                        String openid = r2.getData().toString();
                        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                                    DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format),
                                    "审核驳回,驳回原因:" + partyBuildingMemberVO.getRefuseReason(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败,失败原因:" + e.getMessage());
                        }
                    }
                }
                return r;
            }
        }
        return updated;
    }
    @ApiOperation(value = "删除认证党员审核")
    @PostMapping("/deleteprepartybuildingmember")
    public R deleteprepartybuildingmember(@RequestParam("id") Long id) {
        return partyBuildingWestService.deleteprepartybuildingmember(id);
    }
    @ApiOperation(value = "党员信息导出Excel")
    @PostMapping("/member/export")
    public R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO) {
        organizationVO.setCommunityId(this.getCommunityId());
        String url = userurl;
        String name = "党员信息数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        // 用户搜索了就下载搜索的用户否则下载所有用户
        R r = partyBuildingWestService.exportPartyMember(organizationVO);
        if (R.isOk(r)) {
            List<ComPbMemberExcelVO> eexcelUserDTOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbMemberExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComPbMemberExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员信息数据导出").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }
    @ApiOperation(value = "批量上传照片/视频 (jpg/jpeg/png/mp4/mov)")
    @PostMapping(value = "uploads", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile[] files, HttpServletRequest request) {
        String property = System.getProperty("user.dir");
        String fileExtension = ".jpg";
        List<UploadFilesVO> urlList = new ArrayList<>();
        SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
        sftp.login();
        for (MultipartFile file : files) {
            String originName = file.getOriginalFilename();
            AtomicBoolean isVideo = new AtomicBoolean(false);
            videoExtensionAllow.forEach(ext -> {
                String originNameLowerCase = originName.toLowerCase();
                if (originNameLowerCase.endsWith("." + ext)) {
                    isVideo.set(true);
                }
            });
            if (isVideo.get()) {
                fileExtension = ".mp4";
            }
            if (originName.toLowerCase().endsWith(".mp3")) {
                fileExtension = ".mp3";
            }
            String name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
            try {
                InputStream is = file.getInputStream();
                String fileName =
                        property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
                File file1 = new File(fileName);
                file.transferTo(file1);
                boolean delete = file1.delete();
                log.info("临时文件删除【{}】", delete);
                sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
                UploadFilesVO fileVO = new UploadFilesVO();
                fileVO.setUrl(url + "idcard/" + name);
                urlList.add(fileVO);
            } catch (Exception e) {
                log.error("上传文件失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        sftp.logout();
        return R.ok(urlList);
    }
    @ApiOperation(value = "党员数据统计-分页查询党员数据",response = ComDataStatisticsMemberVo.class)
    @PostMapping("/dataStatistics/member/page")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        statisticsMemberDto.setCommunityId(this.getCommunityId());
        return partyBuildingWestService.pageDataStatisticsMember(statisticsMemberDto);
    }
    @ApiOperation(value = "党员数据统计-根据党组织统计数据",response = ComDataStatisticsOrgVo.class)
    @PostMapping("/dataStatistics/org")
    public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
        statisticsOrgDto.setCommunityId(this.getCommunityId());
        return partyBuildingWestService.getOrgDataStatistics(statisticsOrgDto);
    }
    @ApiOperation(value = "党支部表头数据统计",response = ComDataStatisticsHeaderOrgVo.class)
    @GetMapping("/dataStatistics/header/org")
    public R getHeaderOrgDataStatistics() {
        return partyBuildingWestService.getHeaderOrgDataStatistics(this.getCommunityId());
    }
    @ApiOperation(value = "党员数据统计-导出党员数据")
    @PostMapping("/dataStatistics/member/export")
    public R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        statisticsMemberDto.setCommunityId(this.getCommunityId());
        String url = sftpConfig.getExcelUrl();
        String name = "党员数据统计-党员导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        R r = partyBuildingWestService.exportDataStatisticsMember(statisticsMemberDto);
        if (R.isOk(r)) {
            List<ComDataStatisticsMemberExcelVo> resultList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComDataStatisticsMemberExcelVo.class);
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComDataStatisticsMemberExcelVo.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return r;
    }
//    @ApiOperation(value = "批量新增党委导入excel")
//    @PostMapping(value = "/importPbMemberRole", consumes = "multipart/*", headers = "content-type=multipart/form-date")
//    public R importPbMemberRole(@RequestParam MultipartFile file, HttpServletRequest request) {
//        log.info("传入文件名字【{}】", file.getOriginalFilename());
//        InputStream inputStream = null;
//        try {
//            inputStream = file.getInputStream();
//            EasyExcel.read(inputStream, null,
//                    new ComPbMemberRoleExcelListen(partyBuildingWestService,this.getCommunityId(),this.getUserId(),stringRedisTemplate)).sheet().doRead();
//        } catch (IOException e) {
//            e.printStackTrace();
//            log.error("导入模板失败【{}】", e.getMessage());
//        }
//        return R.ok();
//    }
    @ApiOperation(value = "下载导入失败党委数据")
    @GetMapping("/download/error/pbMemberRole")
    public R downloadErrorPbMemberRole(@RequestParam(value = "key") String key) {
        List<ComPbMemberRoleErrorExcelVo> list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if (isExits) {
            String json = valueOperations.get(key);
            list = JSONArray.parseArray(json, ComPbMemberRoleErrorExcelVo.class);
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "党委导入错误数据" + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComPbMemberRoleErrorExcelVo.class)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("党委导入错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }
    @ApiOperation(value = "社区党委-下载导入模板")
    @GetMapping("/export/pbMemberRole")
    public R exportElder() {
        return R.ok(sftpConfig.getExcelUrl() + "社区党委导入模板.xlsx");
    }
    @ApiOperation("查询是否党员")
    @GetMapping("/checkMember")
    public R checkMember(@RequestParam("idCard")String idCard){
        return partyBuildingWestService.checkMember(idCard);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -43,7 +43,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginCommunityBackage(account, password);
        R r = tokenService.loginCommunityBackage(account, password,this.getAppId());
        return r;
    }
    @ApiOperation(value = "社区平台验证密码", response = LoginReturnVO.class)
@@ -93,7 +93,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginCgBackage(account, password);
        R r = tokenService.loginCgBackage(account, password,this.getAppId());
        return r;
    }
    @ApiOperation(value = "一键报警APP登录",response = LoginReturnsVO.class)
@@ -106,7 +106,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginAlarmApp(account, password);
        R r = tokenService.loginAlarmApp(account, password,this.getAppId());
        return r;
    }
@@ -120,7 +120,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password);
        R r = tokenService.loginXQDP(account, password,this.getAppId());
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborWestApi.java
New file
@@ -0,0 +1,218 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.neighbor.*;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.isNull;
/**
 * @auther llming
 * @describe
 */
@Slf4j
@RestController
@RequestMapping("/neighborWest/")
@Api(tags = {"邻里圈服务"})
public class NeighborWestApi extends BaseController {
    @Resource
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @ApiOperation(value = "邻里圈_分页", response = ComActNeighborCircleAdminVO.class)
    @PostMapping("pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        comActNeighborCircleAdminDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityWestService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
    }
    /**
     * 后台修改邻里圈
     *
     * @param editNeighborCircleAdminVO
     *            请求参数
     */
    @ApiOperation(value = "邻里圈_修改")
    @PostMapping("changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
        R r = communityWestService.changeStatusByAdmin(editNeighborCircleAdminVO);
        if (R.isOk(r)) {// 邻里圈审核
            if (editNeighborCircleAdminVO.getStatus().equals(EditNeighborCircleAdminVO.status.xs)) {
                // 审核通过添加提示信息
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(Long.parseLong(r.getData().toString()));
                sysUserNoticeVO.setType(3);
                sysUserNoticeVO.setTitle("邻里圈审核通过");
                sysUserNoticeVO.setBusinessType(12);
                sysUserNoticeVO.setBusinessTitle("");
                sysUserNoticeVO.setBusinessContent("您发布的邻里圈已通过审核,可在邻里圈模块查看");
                sysUserNoticeVO.setBusinessId(editNeighborCircleAdminVO.getId());
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setBusinessStatus(2);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("邻里圈审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            } else if (editNeighborCircleAdminVO.getStatus().equals(EditNeighborCircleAdminVO.status.bh)) {
                // 审核驳回添加提示信息
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(Long.parseLong(r.getData().toString()));
                sysUserNoticeVO.setType(3);
                sysUserNoticeVO.setTitle("邻里圈审核未通过");
                sysUserNoticeVO.setBusinessType(12);
                sysUserNoticeVO.setBusinessContent("驳回原因:" + editNeighborCircleAdminVO.getRefuseReason());
                sysUserNoticeVO.setBusinessTitle("");
                sysUserNoticeVO.setBusinessId(editNeighborCircleAdminVO.getId());
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setBusinessStatus(1);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("邻里圈审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }
        }
        return r;
    }
    /**
     * 邻里圈_后台删除
     *
     * @param id
     *            邻里圈id
     * @return 邻里圈列表
     */
    @ApiOperation(value = "邻里圈_删除")
    @PostMapping("deleteByAdmin")
    R deleteByAdmin(@RequestParam("id") Long id) {
        return communityWestService.deleteByAdmin(id);
    }
    @ApiOperation(value = "邻里圈_基础详情", response = DetailNeighborCircleAdminVO.class)
    @GetMapping("detailNeighborByAdmin")
    R detailNeighborByAdmin(@RequestParam("id") Long id) {
        return communityWestService.detailNeighborByAdmin(id);
    }
    @ApiOperation(value = "邻里圈的所有评论_分页", response = ComActNeighborCommentByAdminVO.class)
    @PostMapping("detailNeighborAllCommentByAdmin")
    R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
        return communityWestService.detailNeighborAllCommentByAdmin(dto);
    }
    @ApiOperation(value = "评论的状态_修改")
    @PostMapping("changeCommentStatusByAdmin")
    R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
        return communityWestService.changeCommentStatusByAdmin(vo);
    }
    @ApiOperation(value = "邻里圈评论_详情", response = ComActNeighborCommentByAdminVO.class)
    @GetMapping("detailNeighborCommentByAdmin")
    R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
        return communityWestService.detailNeighborCommentByAdmin(id);
    }
    @ApiOperation(value = "邻里圈评论回复_分页", response = ComActNeighborCommentReplyByAdminVO.class)
    @PostMapping("detailNeighborCommentAllReply")
    R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
        return communityWestService.detailNeighborCommentAllReply(dto);
    }
    @ApiOperation(value = "邻里圈评论回复_基本详情", response = ComActNeighborCommentReplyByAdminVO.class)
    @GetMapping("detailNeighborCommentReply")
    R detailNeighborCommentReply(@RequestParam("id") Long id) {
        return communityWestService.detailNeighborCommentReply(id);
    }
    @ApiOperation(value = "评论回复状态_修改")
    @PostMapping("changeCommentReplyStatusByAdmin")
    R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
        return communityWestService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
    }
    @ApiOperation(value = "邻里圈_添加")
    @PostMapping("addNeighborByAdmin")
    R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        addNeighborCircleAdminVO.setUserId(loginUserInfo.getUserId());
        return communityWestService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }
    @ApiOperation(value = "分页查询邻里圈话题列表", response = ComActNeighborCircleTopicAdminVO.class)
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        if (isNull(circleTopicAdminDTO.getCommunityId())) {
            circleTopicAdminDTO.setCommunityId(this.getCommunityId());
        }
        return communityWestService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }
    @ApiOperation(value = "添加邻里圈话题")
    @PostMapping("addNeighborTopicByAdmin")
    public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        addCircleTopicAdminDTO.setCommunityId(this.getCommunityId());
        addCircleTopicAdminDTO.setUserId(this.getUserId());
        return communityWestService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }
    @ApiOperation(value = "编辑邻里圈话题")
    @PostMapping("editNeighborTopicByAdmin")
    public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        if (addCircleTopicAdminDTO.getId() == null) {
            return R.fail("参数错误");
        }
        addCircleTopicAdminDTO.setCommunityId(this.getCommunityId());
        return communityWestService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }
    @ApiOperation(value = "获取社区审核状态")
    @GetMapping("getCircleExamineStatus")
    public R getCircleExamineStatus(){
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        Long communityId = loginUserInfo.getCommunityId();
        //查询社区自动审核是否开着
        String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
        R isOk = communityWestService.getSysConfValue(key + communityId,communityId);
        if(R.isOk(isOk)){
            if(isOk.getData() != null){
                return isOk;
            }else{
                communityWestService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","1");
                isOk.setData("1");
                return isOk;
            }
        }
        return R.ok();
    }
    @ApiOperation(value = "编辑社区审核状态")
    @GetMapping("editCircleExamineStatus")
    public R editCircleExamineStatus(@RequestParam("status") Integer status){
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        Long communityId = loginUserInfo.getCommunityId();
        return communityWestService.editSysConfValue(communityId,status);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHousesApi.java
@@ -52,6 +52,7 @@
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        registerDTO.setAreaCode(this.getAreaCode());
        return communityService.registerRentingHouse(registerDTO);
    }
@@ -103,7 +104,7 @@
    @ApiOperation(value = "方便开发阶段手动调用批量更新小程序码")
    @GetMapping("/updateAllHouseUnionAppCode")
    public R updateAllHouseUnionAppCode() {
        communityService.updateAllHouseUnionAppCode();
        communityService.updateAllHouseUnionAppCode(this.getAreaCode());
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java
@@ -31,6 +31,7 @@
    @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
    @PostMapping("pagestreet")
    public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
        pageComStreetDTO.setAreaCode(this.getAreaCode());
        return communityService.pageStreet(pageComStreetDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
@@ -41,7 +41,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridApp(account, password);
        R r = tokenService.loginGridApp(account, password,this.getAppId());
        if (R.isOk(r)) {
            LoginReturnsVO returnsVO =
                JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginReturnsVO.class);
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/pom.xml
@@ -64,6 +64,11 @@
            <artifactId>minio</artifactId>
            <version>6.0.8</version>
        </dependency>
        <dependency>
            <groupId>com.github.penggle</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3.2</version>
        </dependency>
    </dependencies>
    <build>
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/CommonApi.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.panzhihua.common.utlis.MimeTypeUtils;
import com.panzhihua.grid_backstage.config.MinioUtil;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -27,6 +28,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -120,6 +123,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
@@ -180,4 +180,9 @@
        return gridService.reset(idDTO);
    }
    @GetMapping("/test")
    public R test(){
        return gridService.timedTaskVisitingJobHandler();
    }
}
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/KaphtchaApi.java
New file
@@ -0,0 +1,80 @@
package com.panzhihua.grid_backstage.api;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.time.Duration;
/**
 * @author zzj
 */
@Api(tags = {"验证码接口"})
@RestController
@RequestMapping("/kaphtcha/")
public class KaphtchaApi extends BaseController {
    @Resource
    private DefaultKaptcha defaultKaptcha;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @ApiOperation("生成验证码")
    @GetMapping("/verification")
    public void defaultKaptcha(@RequestParam("uuid")String uuid,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
            throws Exception {
        byte[] captchaChallengeAsJpeg = null;
        ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
        try {
            // 生产验证码字符串并保存到session中,分布式环境存redis中
            String createText = defaultKaptcha.createText();
            stringRedisTemplate.opsForValue().set("verifyCode_"+uuid,createText, Duration.ofMinutes(5));
            // 使用生产的验证码字符串返回一个BufferedImage对象并转为byte写入到byte数组中
            BufferedImage challenge = defaultKaptcha.createImage(createText);
            ImageIO.write(challenge, "jpg", jpegOutputStream);
        } catch (IllegalArgumentException e) {
            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
            return;
        }
        // 定义response输出类型为image/jpeg类型,使用response输出流输出图片的byte数组
        captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
        httpServletResponse.setHeader("Cache-Control", "no-store");
        httpServletResponse.setHeader("Pragma", "no-cache");
        httpServletResponse.setDateHeader("Expires", 0);
        httpServletResponse.setContentType("image/jpeg");
        ServletOutputStream responseOutputStream = httpServletResponse.getOutputStream();
        responseOutputStream.write(captchaChallengeAsJpeg);
        responseOutputStream.flush();
        responseOutputStream.close();
    }
    @ApiOperation("验证码核对")
    @GetMapping("/checkVerifyCode")
    public R checkVerifyCode(@RequestParam("verifyCode")String verifyCode,@RequestParam("uuid")String uuid){
        String text=stringRedisTemplate.opsForValue().get("verifyCode_"+uuid);
        if(StringUtils.isNotEmpty(text)){
            if(verifyCode.equals(text)){
                stringRedisTemplate.delete("verifyCode_"+uuid);
                return R.ok();
            }
            return R.fail("验证码错误");
        }
        return R.fail("验证码失效");
    }
}
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java
@@ -40,7 +40,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridBackstage(account, password);
        R r = tokenService.loginGridBackstage(account, password,this.getAppId());
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/KaptchaConfig.java
New file
@@ -0,0 +1,45 @@
package com.panzhihua.grid_backstage.config;
import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/**
 * @author zzj
 */
@Configuration
public class KaptchaConfig {
    /**
     * 验证码配置
     * @return
     */
    @Bean
    public DefaultKaptcha getDefaultKaptcha(){
        DefaultKaptcha defaultKaptcha=new DefaultKaptcha();
        Properties properties=new Properties();
        //是否有边框
        properties.setProperty(Constants.KAPTCHA_BORDER,"yes");
        //验证码文本颜色
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR,"red");
        //验证码图片宽度
        properties.setProperty(Constants.KAPTCHA_IMAGE_WIDTH,"180");
        //验证码图片高度
        properties.setProperty(Constants.KAPTCHA_IMAGE_HEIGHT,"80");
        //文本字符大小
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE,"39");
        //验证码session的值
        properties.setProperty(Constants.KAPTCHA_SESSION_CONFIG_KEY,"kaptchaCode");
        //验证码文本长度
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH,"4");
        //字体
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "宋体,楷体,微软雅黑");
        Config config=new Config(properties);
        defaultKaptcha.setConfig(config);
        return defaultKaptcha;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -513,4 +513,83 @@
    public R getCourtyardBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getCourtyardBaseData(communityId);
    }
    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/hatch/base")
    public R getHatchBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getHatchBaseData(communityId);
    }
    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/hatchResult/list")
    public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageHatchResult(pageBaseDTO);
    }
    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/hatchSchedule/list")
    public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageHatchSchedule(pageBaseDTO);
    }
    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/fiveAssociations/base")
    public R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getFiveAssociationsBaseData(communityId);
    }
    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/socialProject/list")
    public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageSocialProjectList(pageBaseDTO);
    }
    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/socialOrg/list")
    public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageSocialOrgList(pageBaseDTO);
    }
    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @GetMapping("/dpc/base")
    public R dpcBase(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.dpcBase(communityId);
    }
    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @PostMapping("/dpc/easyPhotoList")
    public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.dpcEasyPhotoList(pageBaseDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
@@ -102,7 +102,7 @@
                .lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId())
                .eq(ComActActivityCode::getType,qrCodeVO.getType()));
        if(comActActivityCode!=null){
            qrCodeVO.setCodeId(comActActivityCode.getId());
            qrCodeVO.setCodeId(comActActivityCode.getId().toString());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail("该活动无有效二维码");
@@ -119,12 +119,12 @@
        if(comActActivityCode!=null){
            comActActivityCodeService.update(new UpdateWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()).set(ComActActivityCode::getStatus,0));
            ComActActivityCode comActActivityCode1=new ComActActivityCode();
            comActActivityCode1.setActivityId(qrCodeVO.getId().longValue());
            comActActivityCode1.setActivityId(Long.parseLong(qrCodeVO.getId()));
            comActActivityCode1.setCreateTime(new Date());
            comActActivityCode1.setType(qrCodeVO.getType());
            comActActivityCode1.setStatus(1);
            comActActivityCodeService.save(comActActivityCode1);
            qrCodeVO.setCodeId(comActActivityCode1.getId());
            qrCodeVO.setCodeId(comActActivityCode1.getId().toString());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
@@ -61,9 +61,7 @@
     */
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn=new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO,comActColumn);
        return R.ok(this.comActColumnService.save(comActColumn));
        return R.ok(this.comActColumnService.addColumn(comActColumnVO));
    }
    /**
@@ -74,9 +72,7 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn=new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO,comActColumn);
        return R.ok(this.comActColumnService.updateById(comActColumn));
        return R.ok(this.comActColumnService.updateColumn(comActColumnVO));
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActDpcApi.java
New file
@@ -0,0 +1,85 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActDpcService;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi {
    @Resource
    private ComActDpcService comActDpcService;
    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @PostMapping("/add")
    public R addDpc(@RequestBody AddDpcDTO addDpcDTO) {
        return comActDpcService.addDpc(addDpcDTO);
    }
    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @PostMapping("/edit")
    public R editDpc(@RequestBody EditDpcDTO editDpcDTO) {
        return comActDpcService.editDpc(editDpcDTO);
    }
    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteDpc(@RequestParam("id") Long id) {
        return comActDpcService.deleteDpc(id);
    }
    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return comActDpcService.detailDpc(id);
    }
    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @PostMapping("/page")
    public R pageDpc(@RequestBody PageDpcDTO pageDpcDTO) {
        return comActDpcService.pageDpc(pageDpcDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.service_community.service.ComActEnterpriseService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi {
    @Resource
    private ComActEnterpriseService enterpriseService;
    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @PostMapping("/add")
    public R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO) {
        return enterpriseService.addEnterprise(addEnterpriseDTO);
    }
    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @PostMapping("/edit")
    public R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO) {
        return enterpriseService.editEnterprise(editEnterpriseDTO);
    }
    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteEnterprise(@RequestParam("id") Long id) {
        return enterpriseService.deleteEnterprise(id);
    }
    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return enterpriseService.detailEnterprise(id);
    }
    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO) {
        return enterpriseService.pageEnterprise(pageEnterpriseDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseTypeApi.java
New file
@@ -0,0 +1,95 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.service_community.service.ComActEnterpriseTypeService;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActEnterpriseTypeApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类管理
 * @author: hans
 * @date: 2022/06/06 15:47
 */
@Slf4j
@RestController
@RequestMapping("/enterpriseType")
public class ComActEnterpriseTypeApi {
    @Resource
    private ComActEnterpriseTypeService comActEnterpriseTypeService;
    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/add")
    public R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        return comActEnterpriseTypeService.addEnterpriseType(addEnterpriseTypeDTO);
    }
    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @PostMapping("/edit")
    public R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO) {
        return comActEnterpriseTypeService.editEnterpriseType(enterpriseTypeDTO);
    }
    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteEnterpriseType(@RequestParam("id") Long id) {
        return comActEnterpriseTypeService.deleteEnterpriseType(id);
    }
    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailEnterpriseType(@RequestParam("id") Long id) {
        return comActEnterpriseTypeService.detailEnterpriseType(id);
    }
    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/page")
    public R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        return comActEnterpriseTypeService.pageEnterpriseType(pageEnterpriseTypeDTO);
    }
    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @GetMapping("/list")
    public R getEnterpriseTypeList(@RequestParam("communityId") Long communityId) {
        return comActEnterpriseTypeService.getEnterpriseTypeList(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java
@@ -48,7 +48,7 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActFourMemberService.get(id);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchApi.java
New file
@@ -0,0 +1,74 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActSocialOrgHatchService;
/**
 * 社会组织孵化表(ComActSocialOrgHatch)表控制层
 *
 * @author makejava
 * @since 2022-04-18 14:12:27
 */
@RestController
@RequestMapping("comActSocialOrgHatch")
public class ComActSocialOrgHatchApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialOrgHatchService comActSocialOrgHatchService;
    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @PostMapping("/page")
    public R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO) {
        return comActSocialOrgHatchService.pageOrgHatch(pageHatchDTO);
    }
    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailOrgHatch(@RequestParam("id") Long id) {
        return comActSocialOrgHatchService.detailOrgHatch(id);
    }
    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @PutMapping("/updateStatus")
    public R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
        return comActSocialOrgHatchService.updateOrgHatchStatus(id, status);
    }
    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @GetMapping("/delete")
    public R deleteOrgHatch(@RequestParam("id") Long id) {
        return comActSocialOrgHatchService.deleteOrgHatch(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchAuditApi.java
New file
@@ -0,0 +1,114 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditService;
/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表控制层
 *
 * @author makejava
 * @since 2022-04-18 14:12:27
 */
@RestController
@RequestMapping("comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialOrgHatchAuditService comActSocialOrgHatchAuditService;
    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @PostMapping("/page")
    public R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        return comActSocialOrgHatchAuditService.pageHatchAudit(pageHatchAuditDTO);
    }
    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailHatchAudit(@RequestParam("id") Long id) {
        return comActSocialOrgHatchAuditService.detailHatchAudit(id);
    }
    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        return comActSocialOrgHatchAuditService.updateHatchAudit(hatchAuditDTO);
    }
    /**
     * 获取孵化流程配置
     * @return
     */
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return comActSocialOrgHatchAuditService.getHatchAuditProcess();
    }
    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @PutMapping("/process")
    public R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO) {
        return comActSocialOrgHatchAuditService.putHatchAuditProcess(processDTO);
    }
    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/add")
    public R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        return comActSocialOrgHatchAuditService.addHatchAudit(hatchAuditDTO);
    }
    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @GetMapping("/schedule")
    public R getHatchAuditSchedule(@RequestParam("userId") Long userId) {
        return comActSocialOrgHatchAuditService.getHatchAuditSchedule(userId);
    }
    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/delete")
    public R deleteHatchAudit(@RequestParam("id") Long id) {
        return comActSocialOrgHatchAuditService.deleteHatchAudit(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,9 +90,7 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        return R.ok(this.comActSocialProjectService.updateById(comActSocialProject));
        return R.ok(this.comActSocialProjectService.updateProject(socialProjectVO));
    }
    /**
@@ -107,10 +107,42 @@
    /**
     * 小程序详情接口
     * @param id
     * @param userId
     * @return
     */
    @GetMapping("/getApplet")
    public R getApplet(@RequestParam("id") Long id){
        return this.comActSocialProjectService.getByApplet(id);
    public R getApplet(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId){
        return this.comActSocialProjectService.getByApplet(id, userId);
    }
    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    @PostMapping("/signList")
    public R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO) {
        return comActSocialProjectService.pageProjectSignList(pageProjectSignListDTO);
    }
    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    @GetMapping("/sign")
    public R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId) {
        return comActSocialProjectService.signProject(projectId, userId);
    }
    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    @PostMapping("/project")
    public R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO) {
        return comActSocialProjectService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -319,8 +319,9 @@
     * @return
     */
    @GetMapping("/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
    public R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                                @RequestParam(value = "areaCode", required = false) String areaCode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2603,4 +2603,34 @@
    public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
        return comActActivityService.exportPartyMemberDetail(commonPage);
    }
    /**
     * 批量删除活动
     * @param ids
     * @return
     */
    @PostMapping("batchDel")
    public R deleteActivities(@RequestBody List<Long> ids) {
        return R.ok(comActActivityService.removeByIds(ids));
    }
    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("dpc/feedback")
    public R getFeedbackList(@RequestParam("id") Long id) {
        return comActEasyPhotoService.getFeedbackList(id);
    }
    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("dpc/feedback")
    public R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunitySwitchApi.java
@@ -24,8 +24,8 @@
     * @return 社区列表
     */
    @GetMapping("/community/all/list")
    public R getCommunityAllList(@RequestParam("areaCode") String areaCode) {
        return comActService.getCommunityAllList(areaCode);
    public R getCommunityAllList(@RequestParam("appId") String appId) {
        return comActService.getCommunityAllList(appId);
    }
    /**
@@ -36,8 +36,8 @@
     * @return 社区列表
     */
    @GetMapping("/community/search/list")
    public R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode) {
        return comActService.communitySwitchSearchList(name,areaCode);
    public R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "appId") String appId) {
        return comActService.communitySwitchSearchList(name,appId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborWestApi.java
New file
@@ -0,0 +1,367 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.neighbor.*;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleWestService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicWestService;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping("/neighborWest/")
public class NeighborWestApi {
    @Resource
    private ComActNeighborCircleWestService comActNeighborCircleWestService;
    @Resource
    private ComActNeighborCircleTopicWestService comActNeighborCircleTopicWestService;
    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("pageNeighborByApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleWestService.pageNeighborByApp(neighborCircleAppDTO);
    }
    /**
     * 用户发布邻里圈审核
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return 发布结果
     */
    @PostMapping("addNeighborByApp")
    public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
        return comActNeighborCircleWestService.addNeighborByApp(addNeighborCircleAppDTO);
    }
    /**
     * 查询邻里圈详情
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈详情
     */
    @PostMapping("neighborDetailByApp")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleWestService.neighborDetailByApp(neighborCircleAppDTO);
    }
    /**
     * 管理后台查询邻里圈列表
     *
     * @param comActNeighborCircleAdminDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("pageNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
        return comActNeighborCircleWestService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
    }
    /**
     * 后台添加邻里圈
     *
     * @param addNeighborCircleAdminVO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("addNeighborByAdmin")
    public R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
        return comActNeighborCircleWestService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }
    /**
     * 后台修改邻里圈
     *
     * @param editNeighborCircleAdminVO
     *            请求参数
     */
    @PostMapping("changeStatusByAdmin")
    public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
        return comActNeighborCircleWestService.changeStatusByAdmin(editNeighborCircleAdminVO);
    }
    /**
     * 邻里圈_后台删除 待审核状态不可删除,显示、隐藏、已驳回的都可以删除)
     *
     * @param id
     *            邻里圈id
     * @return 邻里圈列表
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("deleteByAdmin")
    public R deleteByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleWestService.deleteByAdmin(id);
    }
    /**
     * 用户查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("neighborExamineByApp")
    public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleWestService.neighborExamineByApp(neighborCircleAppDTO);
    }
    /**
     * 邻里圈点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 点赞结果
     */
    @PostMapping("neighborFabulousByApp")
    public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
        return comActNeighborCircleWestService.neighborFabulousByApp(fabulousAppDTO);
    }
    /**
     * 邻里圈转发
     *
     * @param forwardAppDTO
     *            请求参数
     * @return 转发结果
     */
    @PostMapping("neighborForwardByApp")
    public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
        return comActNeighborCircleWestService.neighborForwardByApp(forwardAppDTO);
    }
    /**
     * 邻里圈评论
     *
     * @param commentAppDTO
     *            请求参数
     * @return 评论结果
     */
    @PostMapping("neighborCommentByApp")
    public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
        return comActNeighborCircleWestService.neighborCommentByApp(commentAppDTO);
    }
    /**
     * 邻里圈回复
     *
     * @param replyAppDTO
     *            请求参数
     * @return 回复结果
     */
    @PostMapping("neighborReplyByApp")
    public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
        return comActNeighborCircleWestService.neighborReplyByApp(replyAppDTO);
    }
    /**
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     *
     * @return 执行结果
     */
    @PostMapping("timeTaskCircleFlow")
    public R timeTaskCircleFlow() {
        return comActNeighborCircleWestService.timeTaskCircleFlow();
    }
    /**
     * 查看邻里圈基础_详情
     *
     * @param id
     *            邻里圈id
     * @return 邻里圈列表
     */
    @GetMapping("detailNeighborByAdmin")
    public R detailNeighborByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleWestService.detailNeighborByAdmin(id);
    }
    /**
     * 邻里圈的所有评论_分页
     *
     * @param dto
     *            请求参数
     * @return 评论列表
     */
    @PostMapping("detailNeighborAllCommentByAdmin")
    public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
        return comActNeighborCircleWestService.detailNeighborAllCommentByAdmin(dto);
    }
    /**
     * 评论的状态_修改
     *
     * @param vo
     *            请求参数
     */
    @PostMapping("changeCommentStatusByAdmin")
    @Transactional(rollbackFor = Exception.class)
    public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
        return comActNeighborCircleWestService.changeCommentStatusByAdmin(vo);
    }
    /**
     * 邻里圈评论_详情
     *
     * @param id
     *            评论id
     */
    @GetMapping("detailNeighborCommentByAdmin")
    public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
        return comActNeighborCircleWestService.detailNeighborCommentByAdmin(id);
    }
    /**
     * 邻里圈评论回复_分页
     *
     * @param dto
     *            参数
     */
    @PostMapping("detailNeighborCommentAllReply")
    public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
        return comActNeighborCircleWestService.detailNeighborCommentAllReply(dto);
    }
    /**
     * 邻里圈评论回复_基本详情
     *
     * @param id
     *            参数
     */
    @GetMapping("detailNeighborCommentReply")
    public R detailNeighborCommentReply(@RequestParam("id") Long id) {
        return comActNeighborCircleWestService.detailNeighborCommentReply(id);
    }
    /**
     * 评论的状态_修改
     *
     * @param changeStatusReplyVO
     *            参数
     */
    @PostMapping("changeCommentReplyStatusByAdmin")
    public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
        return comActNeighborCircleWestService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
    }
    /**
     * 邻里圈取消点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 取消点赞结果
     */
    @PostMapping("neighborFabulousCancelByApp")
    public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
        return comActNeighborCircleWestService.neighborFabulousCancelByApp(fabulousAppDTO);
    }
    /**
     * 添加邻里圈浏览记录
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return 返回参数
     */
    @PostMapping("neighborAddBrowseByApp")
    public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
        return comActNeighborCircleWestService.neighborAddBrowseByApp(addBrowseAppDTO);
    }
    /**
     * 分页查询评论下所有回复
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return 回复列表
     */
    @PostMapping("neighborCommentReplyByApp")
    public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
        return comActNeighborCircleWestService.neighborCommentReplyByApp(commentReplyAppDTO);
    }
    /**
     * 分页查询邻里圈话题列表
     *
     * @param circleTopicAdminDTO
     *            请求参数
     * @return 邻里圈话题列表
     */
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        return comActNeighborCircleTopicWestService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }
    /**
     * 添加邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("addNeighborTopicByAdmin")
    public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicWestService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }
    /**
     * 编辑邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("editNeighborTopicByAdmin")
    public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicWestService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    @GetMapping("getNeighborTopicByApp")
    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name) {
        return comActNeighborCircleTopicWestService.getNeighborTopicByApp(communityId,isZero,name);
    }
    /**
     * 小程序-用户新增话题
     * @param circleTopicAppDTO 请求参数
     * @return  新增结果
     */
    @PostMapping("addNeighborTopicByApp")
    public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
        return comActNeighborCircleTopicWestService.addNeighborTopicByApp(circleTopicAppDTO);
    }
    /**
     * 小程序-删除邻里圈
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    @PostMapping("deleteNeighborByApp")
    public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO){
        return comActNeighborCircleWestService.deleteNeighborByApp(circleTopicAppDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRegisterApi.java
@@ -112,7 +112,7 @@
    }
    @GetMapping("/updateAllHouseUnionAppCode")
    public void updateAllHouseUnionAppCode() {
        rentingHourseRegisterService.updateAllHouseUnionAppCode();
    public void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode) {
        rentingHourseRegisterService.updateAllHouseUnionAppCode(areaCode);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
@@ -5,9 +5,11 @@
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
@@ -81,4 +83,14 @@
        return r;
    }
    /**
     * 街道详情
     * @param id
     * @return
     */
    @GetMapping("detailStreet")
    public R detailStreet(@RequestParam("id") Long id) {
        return comStreetService.detailStreet(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -287,10 +287,10 @@
    /**
     * 根据社工id查询活动列表
     * @param page
     * @param id
     * @param commonPage
     * @return
     */
    IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id);
    IPage<ComActActivityVO> selectActivityBySocialWorker(Page page,@Param("commonPage") CommonPage commonPage);
    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码,
@@ -349,4 +349,12 @@
     * @return 活动列表
     */
    List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date,@Param("phone")String phone);
    /**
     * 获取项目活动
     * @param page
     * @param comActActivityVO
     * @return
     */
    IPage<ComActActivityVO> pageProjectActivity(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
@@ -26,7 +26,7 @@
     * @param commonPage
     * @return
     */
    IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    IPage<ComActColumnVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    /**
     * 项目级联查询
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -41,7 +41,8 @@
    @Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
        + "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
        + "com_act c \n" + "ORDER BY\n" + "distance ASC"
        + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>"
        + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
        + "<if test='lng != null and lng.trim() != &quot;&quot;'>" + " limit 100 " + " </if> " + "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);
@@ -51,6 +52,8 @@
    @Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
        + "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>"
        + "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
        + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>"
        + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
        + "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
        + "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
        + " order by a.create_at desc" + "</script>")
@@ -70,8 +73,8 @@
        + "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = ${communityId}")
    ComPopulationActVO getPopulationActById(@Param("communityId") Long communityId);
    @Select("select `name`,street_id from com_street order by area_code asc")
    List<StreetAllAppletsVO> getStreetList(String areaCode);
    @Select("select `name`,street_id from com_street where app_id = #{appId}")
    List<StreetAllAppletsVO> getStreetList(String appId);
    @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
    List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);
@@ -79,16 +82,17 @@
    @Select("<script> select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
            "from com_act as ca " +
            "left join com_street as cs on cs.street_id = ca.street_id " +
            "where ca.state = 0 and ca.name like concat('%',#{name},'%') </script> ")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);
            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='appId !=null and appId !=&quot;&quot;'> and cs.app_id = #{appId} </if> </script> ")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("appId") String appId);
    @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +
            "round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance  " +
            "FROM    com_act c     left join com_street as cs on cs.street_id = c.street_id  " +
            "where cs.area_code = #{communityDTO.areaCode} " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0  </script>")
    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null and areaCode !=&quot;&quot;'> and area_code = #{areaCode} </if> </script>")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);
    @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java
@@ -57,11 +57,4 @@
     * @return
     */
    int selectVotedPersonNum(@Param("discussId") Long discussId);
    /**
     * 批量插入投票记录
     * @param comActDiscussOptionUserDOList
     * @return
     */
    int batchInsert(@Param("comActDiscussOptionUserDOList") List<ComActDiscussOptionUserDO> comActDiscussOptionUserDOList);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActDpc;
/**
 * 人大代表(ComActDpc)表数据库访问层
 *
 * @author makejava
 * @since 2022-06-07 10:55:30
 */
@Mapper
public interface ComActDpcDAO extends BaseMapper<ComActDpc> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActDpc> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActDpc> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActDpc> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActDpc> entities);
    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    ComActDpcVO detailDpc(@Param("id") Long id);
    /**
     * 分页查询人大代表
     * @param page
     * @param pageDpcDTO
     * @return
     */
    IPage<ComActDpcVO> pageDpc(@Param("page") Page page, @Param("pageDpcDTO") PageDpcDTO pageDpcDTO);
    /**
     * 根据手机号获取小程序用户
     * @param phone
     * @return
     */
    SysUserVO selectUser(@Param("phone") String phone);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
@@ -211,6 +212,7 @@
            "c.name communityName," +
            "p.transfer_time," +
            "p.is_report_urban," +
            "p.is_report_dpc," +
            "p.transfer_reason," +
            "ca.`name` as classifyName," +
            "p.urban_status, " +
@@ -251,61 +253,61 @@
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
    @Select("<script> " +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.`nick_name` userNickName, " +
            "u.phone sponsor_phone, " +
            "count(DISTINCT pu.id)giveThumbsUpNum, " +
            "count(DISTINCT c.id)commentNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "p.addr_remark, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`is_hide`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.classify_id, " +
            "class.`name` as classifyName, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
            " <where>" +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,5) and p.is_publicity = 1 " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
            " </if> " +
            "group by p.id "+
            "order by p.create_at desc "+
            " </where>" +
            "</script>"
    )
//    @Select("<script> " +
//            "SELECT " +
//            "p.id, " +
//            "u.`name` sponsor_name, " +
//            "u.`nick_name` userNickName, " +
//            "u.phone sponsor_phone, " +
//            "count(DISTINCT pu.id)giveThumbsUpNum, " +
//            "count(DISTINCT c.id)commentNum, " +
//            "u.image_url, " +
//            "p.happen_addr, " +
//            "p.addr_remark, " +
//            "su.`name` handler_name, " +
//            "p.`status`, " +
//            "p.`is_hide`, " +
//            "p.`detail`, " +
//            "p.`is_need_feed_back`, " +
//            "p.`photo_path_list`, " +
//            "p.create_at, " +
//            "p.feedback_at, " +
//            "p.activity_type, " +
//            "p.activity_amount, " +
//            "p.classify_id, " +
//            "class.`name` as classifyName, " +
//            "p.img_width, " +
//            "p.img_height, " +
//            "p.examine_at  " +
//            "FROM " +
//            "com_act_easy_photo p " +
//            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
//            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
//            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
//            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
//            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
//            " <where>" +
//            " p.del_tag = 0 "  +
//            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
//            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
//            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
//            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
//            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
//            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
//            " </if> " +
//            "group by p.id "+
//            "order by p.create_at desc "+
//            " </where>" +
//            "</script>"
//    )
    IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
@@ -421,4 +423,34 @@
     * @return
     */
    List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    /**
     * 获取上报人大代表的随手拍新增数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getEasyPhotoAddPolylineDataForDpc(@Param("communityId") Long communityId);
    /**
     * 上报人大代表的随手拍累计折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO getEasyPhotoTotalPolylineDateForDpc(@Param("communityId") Long communityId, @Param("date") String date);
    /**
     * 人大代表-随手拍展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActEasyPhotoVO> dpcEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
    /**
     * 获取人大代表基础数据
     * @param communityId
     * @return
     */
    BigScreenDpcStatisticsInfo selectDpcBaseData(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java
@@ -19,4 +19,10 @@
    List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackList(@Param("easyId") Long easyId);
    /**
     * 获取人大代表反馈记录
     * @param easyId
     * @return
     */
    List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackListForDpc(@Param("easyId") Long easyId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoHandlerMapper.java
@@ -54,5 +54,13 @@
     * @date 2022-03-01 13:45:11
     */
    List<ComActEasyPhotoHandlerVo> queryAllByList(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    List<ComActEasyPhotoHandlerVo> selectHandleRecord(@Param("serviceId") Long serviceId, @Param("serviceType") Integer serviceType);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseDAO.java
New file
@@ -0,0 +1,79 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActEnterprise;
/**
 * (ComActEnterprise)表数据库访问层
 *
 * @author makejava
 * @since 2022-05-31 10:17:01
 */
@Mapper
public interface ComActEnterpriseDAO extends BaseMapper<ComActEnterprise> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActEnterprise> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActEnterprise> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActEnterprise> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActEnterprise> entities);
    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    ComActEnterpriseVO detailEnterprise(@Param("id") Long id);
    /**
     * 分页查询社区企业
     * @param page
     * @param pageEnterpriseDTO
     * @return
     */
    IPage<ComActEnterpriseVO> pageEnterprise(@Param("page") Page page, @Param("pageEnterpriseDTO") PageEnterpriseDTO pageEnterpriseDTO);
    /**
     * 社区企业服务分类占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getEnterpriseServiceTypeCircleData(@Param("communityId") Long communityId);
    /**
     * 社区工作者年龄段占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getSocialWorkerAgeStageCircleData(@Param("communityId") Long communityId);
    /**
     * 社区工作者服务分类占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getSocialWorkerServiceTypeCircleData(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseTypeDAO.java
New file
@@ -0,0 +1,64 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActEnterpriseType;
/**
 * (ComActEnterpriseType)表数据库访问层
 *
 * @author makejava
 * @since 2022-06-06 15:30:47
 */
@Mapper
public interface ComActEnterpriseTypeDAO extends BaseMapper<ComActEnterpriseType> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActEnterpriseType> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActEnterpriseType> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActEnterpriseType> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActEnterpriseType> entities);
    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    ComActEnterpriseTypeVO detailEnterpriseType(@Param("id") Long id);
    /**
     * 分页查询服务分类
     * @param page
     * @param pageEnterpriseTypeDTO
     * @return
     */
    IPage<ComActEnterpriseTypeVO> pageEnterpriseType(@Param("page") Page page, @Param("pageEnterpriseTypeDTO") PageEnterpriseTypeDTO pageEnterpriseTypeDTO);
    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    List<ComActEnterpriseTypeVO> getEnterpriseTypeList(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java
@@ -29,8 +29,8 @@
     * @return
     */
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
    ComActFourMemberVO getByIdVillage(Integer id);
    ComActFourMemberVO getById(Long id);
    ComActFourMemberVO getByIdVillage(Long id);
    /**
     * 获取四长四员基础数据
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -30,8 +30,9 @@
    List<ComActMessageBackVO> selectMsgBackList(@Param("id") Long id);
    @Select("<script>" + "select * from com_act_message " + " where "
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))"
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone}) AND type = 2) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}) AND type = 1) "
        + " or (sendto_user_id in (select id from com_act_dpc t3 where t3.phone=#{comActMessageVO.phone}) AND type = 3)) "
        + "<if test='comActMessageVO.status != null'>" + " and status=#{comActMessageVO.status} \n" + " </if> "
        + " order by create_at desc" + "</script>")
    IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page,
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseWestDAO.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表mapper类
 */
@Mapper
public interface ComActNeighborCircleBrowseWestDAO extends BaseMapper<ComActNeighborCircleBrowseWestDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyWestDAO.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表mapper类
 */
@Mapper
public interface ComActNeighborCircleCommentReplyWestDAO extends BaseMapper<ComActNeighborCircleCommentReplyWestDO> {
    @Select("<script> " + "select reply.id,reply.comment_id, reply.reply_content,reply.fabulous_num "
        + ",reply.create_at,reply.is_release,su1.nick_name as userName "
        + ",su1.image_url as userHeadUrl,su2.nick_name as parentUserName "
        + " from com_act_neighbor_circle_comment_reply as reply"
        + " left join sys_user su1 on su1.user_id = reply.user_id "
        + " left join sys_user su2 on su2.user_id = reply.parent_user_id "
        + " where reply.status = 1 and reply.comment_id = #{commentId} order by create_at desc" + " </script>")
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);
    @Select("<script> "
        + "select cr.*,u.name as userName,u.phone as userPhone,u.nick_name as userNickName  from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  "
        + "<where>" + "<if test='dto.id != null and dto.id!= 0l'>" + "cr.comment_id = #{dto.id}" + " </if> "
        + "</where>" + " ORDER BY cr.create_at" + "</script>")
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page page,
        @Param("dto") DetailNeighborCommentReplyByAdminDTO dto);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentWestDAO.java
New file
@@ -0,0 +1,41 @@
package com.panzhihua.service_community.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表mapper类
 */
@Mapper
public interface ComActNeighborCircleCommentWestDAO extends BaseMapper<ComActNeighborCircleCommentWestDO> {
    @Select("<script> " + "select cancc.id,cancc.circle_id,cancc.user_id,cancc.content,cancc.fabulous_num"
        + ",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl "
        + " from com_act_neighbor_circle_comment as cancc " + " left join sys_user as su on su.user_id = cancc.user_id"
        + " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1"
        + "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>"
        + " order by cancc.create_at desc" + " </if> "
        + "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>"
        + " order by cancc.create_at asc" + " </if> " + " </script>")
    IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page,
        @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
    @Select("<script> "
        + "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id  "
        + "<where>" + "<if test='dto.id != null and dto.id!= 0l'>" + "nc.circle_id = #{dto.id}" + " </if> " + "</where>"
        + " ORDER BY create_at" + "</script>")
    IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page,
        @Param("dto") DetailNeighborAllCommentByAdminDTO dto);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleFabulousWestDAO.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表mapper类
 */
@Mapper
public interface ComActNeighborCircleFabulousWestDAO extends BaseMapper<ComActNeighborCircleFabulousWestDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicWestMapper.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicWestDO;
/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表mapper类
 */
@Mapper
public interface ComActNeighborCircleTopicWestMapper extends BaseMapper<ComActNeighborCircleTopicWestDO> {
    /**
     * 分页查询邻里圈话题列表
     *
     * @param circleTopicAdminDTO
     *            请求参数
     * @return 邻里圈话题列表
     */
    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page,
        @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId,@Param("isZero") Integer isZero,@Param("name") String name);
    /**
     * 添加邻里圈话题热度
     * @param circleTopicId 邻里圈话题id
     * @param hotNum    热度值
     */
    void addHotNum(@Param("circleTopicId") Long circleTopicId,@Param("hotNum") Long hotNum);
    /**
     * 添加邻里圈话题邻里圈数量
     * @param circleTopicId 邻里圈话题id
     */
    void addCount(@Param("circleTopicId") Long circleTopicId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleWestDAO.java
New file
@@ -0,0 +1,145 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import java.util.Map;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.common.model.vos.screen.PieElementVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表mapper类
 */
@Mapper
public interface ComActNeighborCircleWestDAO extends BaseMapper<ComActNeighborCircleWestDO> {
    /**
     * 分页查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
    @Select("<script> " + "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content "
        + ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName,canc.refuse_reason "
        + ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle_west as canc "
        + " left join sys_user as su on su.user_id = canc.release_id  "
        + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId} and canc.is_del = 2"
        + " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
    IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
    @Select("select * from sys_user where user_id=#{userId}")
    AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
    @Select("<script> "
        + "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at,canct.name as topicName"
        + ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl "
        + " from com_act_neighbor_circle_west as canc " + " left join sys_user as su on su.user_id = canc.release_id "
        + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id "
        + " where canc.release_id = #{userId} and canc.is_del = 2 and canc.status != 3 order by create_at desc" + " </script>")
    IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page, @Param("userId") Long userId);
    @Select("select reply.id,reply.comment_id,reply.reply_content,reply.fabulous_num,reply.create_at"
        + ",reply.is_release,su.nick_name as userName,su.image_url as userHeadUrl,su1.nick_name as oldUserName"
        + " from com_act_neighbor_circle_comment_reply as reply"
        + " left join sys_user as su on su.user_id = reply.user_id"
        + " left join sys_user as su1 on su1.user_id = reply.parent_user_id"
        + " where reply.comment_id = #{commentId} and reply.status = 1")
    IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);
    @Select("SELECT id,release_content as content FROM com_act_neighbor_circle_west WHERE community_id = ${communityId} and status = 2 ORDER BY create_at DESC limit #{pageSize}")
    List<CarouselInfoVO> screenNeighborCircle(@Param("communityId") Long communityId,
        @Param("pageSize") Integer pageSize);
    @Select(" SELECT COUNT(id) AS totalNum,"
        + " (SELECT COUNT(id) FROM com_act_neighbor_circle_west WHERE  community_id = ${communityId} AND status = 2 AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
        + "  FROM com_act_neighbor_circle_west WHERE community_id = ${communityId} AND status = 2")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
    @Select("SELECT SUM(comment_num) as commentNum,SUM(fabulous_num) as fabulousNum,SUM(forward_num) as forwardNum FROM com_act_neighbor_circle_west WHERE  community_id = ${communityId} and status = 2 ")
    Map<String, Object> sumScreenNum(@Param("communityId") Long communityId);
    @Select("SELECT release_images FROM com_act_neighbor_circle_west WHERE  community_id = ${communityId} and status = 2 order by create_at desc limit #{pageSize}")
    List<String> screenNeighborCircleImgs(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = ${communityId} AND STATUS = 6 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle_west WHERE community_id = ${communityId} AND STATUS = 2 "
        + "UNION ALL "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS name FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_process_status = 2 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'社区活动' as name FROM com_act_activity WHERE community_id = ${communityId} AND STATUS = 5 ")
    List<PieElementVO> countAllCompletedWorkByCommunityId(@Param("communityId") Long communityId);
    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2)  "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4) "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle_west WHERE community_id = ${communityId} AND STATUS = 1 "
        + "UNION ALL "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS NAME FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_status = 2 and e.event_deal_status in (1,2,3) "
        + "UNION ALL "
        + "SELECT COUNT(id),'社区活动' as name FROM com_act_activity WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4)  ")
    List<PieElementVO> countAllNoneCompletedWorkByCommunityId(@Param("communityId") Long communityId);
    @Select(" SELECT AVG(b.t)AS avgTime "
            + "  FROM (SELECT  TIMESTAMPDIFF(MINUTE,create_at,feedback_at) AS t  FROM com_act_easy_photo WHERE community_id = ${communityId} and STATUS = 4 "
            + "  UNION ALL SELECT  TIMESTAMPDIFF(MINUTE,create_at,finish_at) AS t  FROM com_act_micro_wish WHERE community_id = ${communityId} and STATUS = 6 "
            + "  )AS b ")
    Map<String, Object> countAvgByCommunityId(@Param("communityId")Long communityId);
    void addHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);
    void addTopicHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);
    /**
     * 获取大屏邻里圈展示图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getAllImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    /**
     * 获取大屏邻里圈展示文本内容
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getContents(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    List<StatisticsCommVO> getIndexNeighborBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getNeighborAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getNeighborTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    IPage<ComActNeighborCircleAdminVO> indexNeighborList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialMember;
import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,11 @@
     * @return
     */
    ComActSocialMemberVO detail(Long id);
    /**
     * 查询社区工作人员
     * @param id
     * @return
     */
    ComPbServiceTeamVO selectPbServiceTeamById(@Param("id") Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -48,4 +49,38 @@
     * @return
     */
    List<BigScreenHmkProjectTypeInfo> selectType(Long communityId);
    /**
     * 根据userID查询管理社会组织
     * @param userId
     * @return
     */
    ComActSocialOrg selectOrgByUserId(@Param("userId") Long userId);
    /**
     * 孵化中心-孵化成果展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageHatchResult(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);
    /**
     * 孵化中心-孵化进度展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageHatchSchedule(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);
    /**
     * 五社联动社会组织展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageSocialOrgList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditDAO.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Mapper
public interface ComActSocialOrgHatchAuditDAO extends BaseMapper<ComActSocialOrgHatchAudit> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatchAudit> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatchAudit> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatchAudit> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatchAudit> entities);
    /**
     * 分页查询社会组织孵化申请
     * @param page
     * @param pageHatchAuditDTO
     * @return
     */
    IPage<SocialOrgHatchAuditVO> pageHatchAudit(@Param("page") Page page, @Param("pageHatchAuditDTO") PageSocialOrgHatchAuditDTO pageHatchAuditDTO);
    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    SocialOrgHatchAuditVO detailHatchAudit(@Param("id") Long id);
    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    SocialOrgHatchAuditVO getHatchAuditSchedule(@Param("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditScheduleDAO.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 15:10:47
 */
@Mapper
public interface ComActSocialOrgHatchAuditScheduleDAO extends BaseMapper<ComActSocialOrgHatchAuditSchedule> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatchAuditSchedule> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatchAuditSchedule> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatchAuditSchedule> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatchAuditSchedule> entities);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchDAO.java
New file
@@ -0,0 +1,96 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
/**
 * 社会组织孵化表(ComActSocialOrgHatch)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Mapper
public interface ComActSocialOrgHatchDAO extends BaseMapper<ComActSocialOrgHatch> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatch> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatch> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialOrgHatch> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatch> entities);
    /**
     * 分页查询孵化数据
     * @param page
     * @param pageHatchDTO
     * @return
     */
    IPage<SocialOrgHatchVO> pageOrgHatch(@Param("page") Page page, @Param("pageHatchDTO") PageSocialOrgHatchDTO pageHatchDTO);
    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    SocialOrgHatchVO detailOrgHatch(@Param("id") Long id);
    /**
     * 获取孵化中心基础统计数据
     * @param communityId
     * @param streetId
     * @return
     */
    BigScreenHatchStatisticsInfo getHatchBaseData(@Param("communityId") Long communityId, @Param("streetId") Long streetId);
    /**
     * 孵化进程占比圆形图数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getHatchScheduleCircleData(@Param("streetId") Long streetId);
    /**
     * 孵化状态占比柱形数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getHatchStatusColumnData(@Param("streetId") Long streetId);
    /**
     * 街道组织占比柱形数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getStreetOrgColumnData(@Param("streetId") Long streetId);
    /**
     * 根据街道名称获取街道组织分类统计
     * @param streetName
     * @return
     */
    List<StatisticsCommVO> getStreetOrgChildData(@Param("streetName") String streetName);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java
@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -80,4 +85,36 @@
     * @return
     */
    SocialProjectVO selectByLevel(Long id);
    /**
     * 分页查询项目报名列表
     * @param page
     * @param pageProjectSignListDTO
     * @return
     */
    IPage<ComActSocialOrgVO> pageProjectSignList(@Param("page") Page page, @Param("pageProjectSignListDTO") PageProjectSignListDTO pageProjectSignListDTO);
    /**
     * 分页查询用户报名的项目
     * @param page
     * @param pageProjectDTO
     * @return
     */
    IPage<SocialProjectVO> pageProjectWhichIsSignedByUser(@Param("page") Page page, @Param("pageProjectDTO") PageProjectDTO pageProjectDTO);
    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<SocialProjectVO> pageSocialProjectList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);
    /**
     * 五社联动基础数据
     * @param communityId
     * @param streetId
     * @return
     */
    BigScreenFiveAssociationsStatisticsInfo getFiveAssociationsBaseData(@Param("communityId") Long communityId, @Param("streetId") Long streetId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectSignDAO.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialProjectSign;
/**
 * (ComActSocialProjectSign)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-19 13:30:42
 */
@Mapper
public interface ComActSocialProjectSignDAO extends BaseMapper<ComActSocialProjectSign> {
    /**
     * 批量新增数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialProjectSign> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialProjectSign> entities);
    /**
     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
     *
     * @param entities
     *            List<ComActSocialProjectSign> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialProjectSign> entities);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java
@@ -63,4 +63,11 @@
     * @return
     */
    ComActSocialWorkerVO selectOneById(Long id);
    /**
     * 根据技能id查询社工列表
     * @param id
     * @return
     */
    List<ComActSocialWorker> selectIncludeSkillWorkerList(@Param("id") Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
@@ -37,7 +37,7 @@
        + "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>"
        + " and t.community_id = ${pageComMngCarDTO.communityId} " + " </if> "
        + "<if test='pageComMngCarDTO.areaName != null and pageComMngCarDTO.areaName != &quot;&quot;'>"
        + " and t2.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " + " </if> "
        + " and t.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " + " </if> "
        + " order by t.create_at desc" + "</script>")
    IPage<ComMngCarVO> pageQueryComMngCar(Page page,
        @Param(value = "pageComMngCarDTO") PageComMngCarDTO pageComMngCarDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComStreetDAO.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import org.apache.ibatis.annotations.Param;
/**
 * @author: llming
@@ -12,4 +13,10 @@
@Mapper
public interface ComStreetDAO extends BaseMapper<ComStreetDO> {
    /**
     * 获取行政区域
     * @param areaCode
     * @return
     */
    String retrieveRegions(@Param("areaCode") String areaCode);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsMerchantDAO.java
@@ -90,4 +90,11 @@
     * @return
     */
    Integer updateIsPauseStatus(@Param("needDealIds") List<Long> needDealIds);
    /**
     * 设置相关联用户为启用状态
     * @param userId
     * @return
     */
    Integer enableUserStatus(@Param("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java
@@ -29,6 +29,6 @@
     */
    IPage<SysConfVO> findByPage(Page page, @Param("pageSysConfDTO") PageSysConfDTO pageSysConfDTO);
        String getSysConfValue(@Param("key")String key,@Param("communityId") Long communityId);
    String getSysConfValue(@Param("key") String key, @Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidCheckRecord.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = 511018347419682300L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidDangerMember.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = 889636932941876579L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidMember.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -32,7 +34,8 @@
    private static final long serialVersionUID = -88592294208705755L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java
@@ -35,7 +35,7 @@
    private static final long serialVersionUID = 681488919320181854L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidUpdateRecord.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = -90587224071702612L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityCode.java
@@ -34,7 +34,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = -26741210716448548L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 935049089365383863L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java
@@ -33,7 +33,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActDpc.java
New file
@@ -0,0 +1,85 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * 人大代表(ComActDpc)表实体类
 *
 * @author makejava
 * @since 2022-06-07 11:02:04
 */
@Data
@TableName(value = "com_act_dpc")
@SuppressWarnings("serial")
public class ComActDpc implements Serializable {
    private static final long serialVersionUID = 853854468470571468L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 姓名
     */
    private String name;
    /**
     * 手机号
     */
    private String phone;
    /**
     * 民族
     */
    private String nation;
    /**
     * 性别(1.男 2.女 3.未知)
     */
    private Integer sex;
    /**
     * 选区
     */
    private String area;
    /**
     * 所属家/站
     */
    private String belong;
    /**
     * 代表类别
     */
    private String category;
    /**
     * 单位职务
     */
    private String position;
    /**
     * 照片
     */
    private String photo;
    /**
     * 是否删除
     */
    private Boolean isDel;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;
    /**
     * 社区id
     */
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoEvaluate.java
@@ -3,6 +3,9 @@
import java.util.Date;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
@@ -12,11 +15,13 @@
 * @since 2022-03-01 13:44:23
 */
@Data
@TableName("com_act_easy_photo_evaluate")
public class ComActEasyPhotoEvaluate implements Serializable {
    private static final long serialVersionUID = -10187231854376444L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoHandler.java
@@ -3,6 +3,9 @@
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
@@ -12,11 +15,13 @@
 * @since 2022-03-01 13:45:11
 */
@Data
@TableName(value = "com_act_easy_photo_handler")
public class ComActEasyPhotoHandler implements Serializable {
    private static final long serialVersionUID = -15137895736835383L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -32,7 +34,8 @@
    private static final long serialVersionUID = 309168056104824588L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterprise.java
New file
@@ -0,0 +1,89 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActEnterprise)表实体类
 *
 * @author makejava
 * @since 2022-05-31 13:53:55
 */
@Data
@TableName(value = "com_act_enterprise")
@SuppressWarnings("serial")
public class ComActEnterprise implements Serializable {
    private static final long serialVersionUID = 484549866500196049L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 企业名称
     */
    private String name;
    /**
     * 统一社会信用代码
     */
    private String agencyCode;
    /**
     * 法定代表人
     */
    private String legalRepresentative;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 注册时间
     */
    private Date registeAt;
    /**
     * 所属社区
     */
    private Long communityId;
    /**
     * 地址
     */
    private String address;
    /**
     * 企业介绍
     */
    private String introduct;
    /**
     * 企业logo
     */
    private String logo;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;
    /**
     * 状态(1.启用 2.禁用)
     */
    private Integer status;
    /**
     * 所属街道
     */
    private Long streetId;
    /**
     * 服务类型
     */
    private Long type;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterpriseType.java
New file
@@ -0,0 +1,61 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActEnterpriseType)表实体类
 *
 * @author makejava
 * @since 2022-06-06 15:30:48
 */
@Data
@TableName(value = "com_act_enterprise_type")
@SuppressWarnings("serial")
public class ComActEnterpriseType implements Serializable {
    private static final long serialVersionUID = 259040183344787442L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 服务分类名称
     */
    private String name;
    /**
     * 描述
     */
    private String description;
    /**
     * 状态(1.启用 2.停用)
     */
    private Integer status;
    /**
     * 是否删除
     */
    private Boolean isDel;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 905771115750112478L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = -19557136291047637L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 706879121724104929L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = 201328912468431601L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActReserveDangerArea.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = -25840459480337775L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 279847158941704646L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -104,4 +104,6 @@
     */
    private Long userId;
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
@@ -34,7 +34,7 @@
     * ID
     */
    @ApiModelProperty(value = "ID")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -264,7 +264,7 @@
    private String latitude;
    @ApiModelProperty("服务类型")
    private Long serviceType;
    private String serviceType;
    @ApiModelProperty("街道id")
    private Long streetId;
@@ -272,4 +272,22 @@
    @ApiModelProperty("是否三社 0否1是")
    private Integer isSociety;
    @ApiModelProperty("孵化单位")
    private Long hatchUnit;
    @ApiModelProperty("孵化单位类型(1.街道 2.社区)")
    private Integer hatchUnitType;
    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;
    @ApiModelProperty("挂靠单位")
    private Long affiliatedUnit;
    @ApiModelProperty("挂靠单位类型(1.街道 2.社区)")
    private Integer affiliatedUnitType;
    @ApiModelProperty("挂靠单位名称")
    private String affiliatedUnitName;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatch.java
New file
@@ -0,0 +1,81 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * 社会组织孵化表(ComActSocialOrgHatch)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:07
 */
@Data
@TableName(value = "com_act_social_org_hatch")
@SuppressWarnings("serial")
public class ComActSocialOrgHatch implements Serializable {
    private static final long serialVersionUID = -29246013392324151L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 准社会组织名称
     */
    private String name;
    /**
     * 负责人
     */
    private String responsibility;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 孵化单位
     */
    private Long hatchUnit;
    /**
     * 孵化单位类型(1.街道 2.社区)
     */
    private Integer hatchUnitType;
    /**
     * 孵化单位名称
     */
    private String hatchUnitName;
    /**
     * 孵化状态(1.孵化中 2.孵化成功)
     */
    private Integer status;
    /**
     * 开始孵化日期
     */
    private Date createdAt;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 组织介绍
     */
    private String introduction;
    /**
     * 组织标识
     */
    private String logo;
    /**
     * 申请原因
     */
    private String applyReason;
    /**
     * 服务范围
     */
    private String serviceScope;
    /**
     * 申请关联id
     */
    private Long auditId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAudit.java
New file
@@ -0,0 +1,81 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:10
 */
@Data
@TableName(value = "com_act_social_org_hatch_audit")
@SuppressWarnings("serial")
public class ComActSocialOrgHatchAudit implements Serializable {
    private static final long serialVersionUID = -12554435202494916L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 准社会组织名称
     */
    private String name;
    /**
     * 负责人
     */
    private String responsibility;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 孵化单位
     */
    private Long hatchUnit;
    /**
     * 孵化单位类型(1.街道 2.社区)
     */
    private Integer hatchUnitType;
    /**
     * 孵化单位名称
     */
    private String hatchUnitName;
    /**
     * 申请用户
     */
    private Long userId;
    /**
     * 申请状态(1.待审核 2.审核通过 3.已驳回)
     */
    private Integer status;
    /**
     * 申请时间
     */
    private Date createdAt;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 组织介绍
     */
    private String introduction;
    /**
     * 组织标识
     */
    private String logo;
    /**
     * 申请原因
     */
    private String applyReason;
    /**
     * 服务范围
     */
    private String serviceScope;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAuditSchedule.java
New file
@@ -0,0 +1,48 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:47
 */
@Data
@TableName(value = "com_act_social_org_hatch_audit_schedule")
@SuppressWarnings("serial")
public class ComActSocialOrgHatchAuditSchedule implements Serializable {
    private static final long serialVersionUID = 779830361079215649L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社会组织孵化申请关联id
     */
    private Long auditId;
    /**
     * 审核阶段
     */
    private String stage;
    /**
     * 阶段详情
     */
    private String detail;
    /**
     * 创建时间
     */
    private Date createdAt;
    public interface Stage {
        String tjzl = "提交资料";
        String ybh = "已驳回";
        String cxtj = "重新提交";
        String shtg = "审核通过";
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
@@ -1,9 +1,12 @@
package com.panzhihua.service_community.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -30,7 +33,7 @@
    private static final long serialVersionUID = -24945028672614601L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -128,4 +131,24 @@
    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 项目资金
     */
    private BigDecimal funds;
    /**
     * 项目报名截止时间
     */
    private Date signUpEnd;
    /**
     * 是否公示(1.是 2.否)
     */
    private Integer isPublicity;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 982451898968415899L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = -90937393082259077L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -74,4 +74,6 @@
     */
    @ApiModelProperty(value = "是否置顶")
    private Integer isTop;
    private String releaseName;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = -17588094441653342L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSign.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActSocialProjectSign)表实体类
 *
 * @author makejava
 * @since 2022-04-19 15:42:56
 */
@Data
@TableName(value = "com_act_social_project_sign")
@SuppressWarnings("serial")
public class ComActSocialProjectSign implements Serializable {
    private static final long serialVersionUID = 204246835752273001L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社会组织id
     */
    private Long orgId;
    /**
     * 项目id
     */
    private Long projectId;
    /**
     * 报名时间
     */
    private Date createdAt;
    /**
     * 报名用户
     */
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java
@@ -2,7 +2,9 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +36,7 @@
     * ID
     */
    @ApiModelProperty(value = "ID")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -129,6 +131,7 @@
     * 图片
     */
    @ApiModelProperty(value = "图片")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String image;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java
@@ -32,7 +32,7 @@
    private static final long serialVersionUID = 984587632214927218L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseApply.java
@@ -31,14 +31,14 @@
    private static final long serialVersionUID = 225290522401641721L;
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 物品id
     */
    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;
    /**
     * 物品数量
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseBase.java
@@ -28,8 +28,8 @@
    private static final long serialVersionUID = -68726161070095574L;
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 义仓说明
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseDonates.java
@@ -34,7 +34,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java
@@ -27,14 +27,14 @@
    private static final long serialVersionUID = -74893029545359720L;
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 物品id
     */
    @ApiModelProperty(value = "物品id")
    private Integer goodsId;
    private Long goodsId;
    /**
     * 操作内容
@@ -52,7 +52,7 @@
     * 操作人
     */
    @ApiModelProperty(value = "操作人")
    private Integer userId;
    private Long userId;
    /**
     *类型 1签收,取消操作 2捐赠操作
@@ -64,7 +64,7 @@
     * 申请id
     */
    @ApiModelProperty(value = "申请id")
    private Integer applyId;
    private Long applyId;
    public interface type{
        int bxs=1;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComAreaTownCommunity.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 563639918375670491L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbCheckUnit.java
@@ -25,7 +25,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbServiceTeam.java
@@ -30,7 +30,7 @@
    private static final long serialVersionUID = -12211594984638204L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComProperty.java
@@ -32,7 +32,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPropertyWorker.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -20,6 +22,7 @@
    /**
     * 物业工作人员id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 工作人员姓名
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsCoupon.java
@@ -20,7 +20,7 @@
public class McsCoupon implements Serializable {
    private static final long serialVersionUID = 236342407932267836L;
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 关联id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsOrder.java
@@ -31,7 +31,7 @@
    private static final long serialVersionUID = -92724536016243196L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsProduct.java
@@ -20,7 +20,7 @@
public class McsProduct implements Serializable {
    private static final long serialVersionUID = 415357403059379804L;
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 产品名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseContractConfig.java
@@ -34,7 +34,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseFile.java
@@ -34,7 +34,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseLabel.java
@@ -34,7 +34,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseOrder.java
@@ -35,7 +35,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePayingOrder.java
@@ -35,7 +35,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePreOrder.java
@@ -35,7 +35,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRefundOrder.java
@@ -35,7 +35,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRegister.java
@@ -37,7 +37,7 @@
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseReturnOrder.java
@@ -35,7 +35,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysTemplateConfig.java
@@ -28,7 +28,7 @@
    private static final long serialVersionUID = 159008627741278306L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -89,13 +89,13 @@
                    String town=comActAcidRecordVO.getLocalCity().split(",")[2];
                    String area=comActAcidRecordVO.getLocalCity().split(",")[1];
                    String country=comActAcidRecordVO.getLocalCity().split(",")[0];
                    List<ComActDO> comActDOS=comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town));
                    List<ComActDO> comActDOS=comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town).eq(ComActDO::getAppId,"wx118de8a734d269f0"));
                    if(CollectionUtils.isNotEmpty(comActDOS)){
                        if(comActDOS.size()==1){
                            loginUserInfoVO.setCommunityId(comActDOS.get(0).getCommunityId());
                        }
                        else {
                            ComActDO comActDO=comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town).and(comActDOLambdaQueryWrapper -> comActDOLambdaQueryWrapper.like(ComActDO::getAddress,town).or().like(ComActDO::getAddress,area).or().like(ComActDO::getAddress,country)));
                            ComActDO comActDO=comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId,"wx118de8a734d269f0").eq(ComActDO::getName,town).and(comActDOLambdaQueryWrapper -> comActDOLambdaQueryWrapper.like(ComActDO::getAddress,town).or().like(ComActDO::getAddress,area).or().like(ComActDO::getAddress,country)));
                            if(comActDO!=null){
                                loginUserInfoVO.setCommunityId(comActDO.getCommunityId());
                            }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActEvaluateDO.java
@@ -25,7 +25,7 @@
    /**
    * 自增id
    */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java
@@ -24,7 +24,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPrizeDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java
@@ -24,7 +24,7 @@
    /**
    * 自增id
    */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -71,7 +71,7 @@
    /**
     * 二维码id
     */
    private Integer codeId;
    private Long codeId;
    /**
     * 活动类型 1居民,志愿者 2党员
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java
@@ -26,7 +26,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -26,7 +26,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -211,7 +211,7 @@
    private String activityType;
    /**
     * 是否居民活动
     * 是否项目
     */
    private Integer isProject;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
@@ -21,7 +21,7 @@
    /**
     * community_id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long communityId;
    /**
@@ -115,4 +115,6 @@
     */
    private String plaintextPassword;
    private String appId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java
@@ -21,7 +21,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentUserDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java
@@ -21,7 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java
@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -21,6 +23,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
@@ -21,7 +21,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java
@@ -22,7 +22,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynTypeDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynUserDO.java
@@ -21,7 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityRecordDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentDO.java
@@ -22,7 +22,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentUserDO.java
@@ -22,7 +22,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -4,7 +4,11 @@
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -22,7 +26,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -145,6 +149,10 @@
     */
    private Long completeId;
    /**
     * 是否上报到人大代表( 0未上报 1已上报)
     */
    private Integer isReportDpc;
    /**
     * 是否上报到城管( 0未上报 1已上报 2已退回)
     */
    private Integer isReportUrban;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
@@ -52,6 +52,11 @@
     */
    private Long createBy;
    /**
     * 反馈人员类型(1.普通反馈 2.人大代表反馈)
     */
    private Integer type;
    @Override
    public String toString() {
        return "ComActEasyPhotoFeedbackDO{" + "id=" + id + ", easyId=" + easyId + ", feedbackContent=" + feedbackContent
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoRewardDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoUserDO.java
@@ -21,7 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserChangeDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageDO.java
@@ -2,9 +2,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -16,6 +14,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java
@@ -20,8 +20,8 @@
    private static final long serialVersionUID = 1L;
        @TableId(type = IdType.AUTO)
        private Integer id;
        @TableId(type = IdType.ASSIGN_ID)
        private Long id;
    /**
    * 微心愿Id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
@@ -24,8 +24,8 @@
    private static final long serialVersionUID = 1L;
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 操作内容
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishUserDO.java
@@ -21,7 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseWestDO.java
New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表实体类
 */
@Data
@TableName("com_act_neighbor_circle_browse_west")
public class ComActNeighborCircleBrowseWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 邻里圈id
     */
    private Long neighborId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 浏览时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    @Override
    public String toString() {
        return "ComActNeighborCircleBrowseDO{" + "id=" + id + ", neighborId=" + neighborId + ", userId=" + userId
            + ", createAt=" + createAt + "}";
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyWestDO.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表实体类
 */
@Data
@TableName("com_act_neighbor_circle_comment_reply_west")
public class ComActNeighborCircleCommentReplyWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 邻里圈id
     */
    private Long circleId;
    /**
     * 评论id
     */
    private Long commentId;
    /**
     * 上级回复id
     */
    private Long parentId;
    /**
     * 上级回复用户id
     */
    private Long parentUserId;
    /**
     * 回复用户id
     */
    private Long userId;
    /**
     * 回复内容
     */
    private String replyContent;
    /**
     * 点赞数
     */
    private Integer fabulousNum;
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 是否是作者回复(1.是 2.否)
     */
    private Integer isRelease;
    /**
     * 状态(1.显示 2.隐藏)
     */
    private Integer status;
    @Override
    public String toString() {
        return "ComActNeighborCircleCommentReplyDO{" + "id=" + id + ", circleId=" + circleId + ", commentId="
            + commentId + ", parentId=" + parentId + ", parentUserId=" + parentUserId + ", userId=" + userId
            + ", replyContent=" + replyContent + ", fabulousNum=" + fabulousNum + ", createAt=" + createAt
            + ", isRelease=" + isRelease + "}";
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentWestDO.java
New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表实体类
 */
@Data
@TableName("com_act_neighbor_circle_comment_west")
public class ComActNeighborCircleCommentWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 邻里圈id
     */
    private Long circleId;
    /**
     * 评论用户id
     */
    private Long userId;
    /**
     * 评论内容
     */
    private String content;
    /**
     * 评论用户手机号
     */
    private String userPhone;
    /**
     * 点赞数
     */
    private Integer fabulousNum;
    /**
     * 状态(1.显示 2.隐藏)
     */
    private Integer status;
    /**
     * 评论时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 是否是作者评论(1.是 2.否)
     */
    private Integer isRelease;
    @Override
    public String toString() {
        return "ComActNeighborCircleCommentDO{" + "id=" + id + ", circleId=" + circleId + ", userId=" + userId
            + ", content=" + content + ", userPhone=" + userPhone + ", fabulousNum=" + fabulousNum + ", status="
            + status + ", createAt=" + createAt + ", isRelease=" + isRelease + "}";
    }
    /**
     * 是否是作者评论(1.是 2.否)
     */
    public interface isRelease {
        int yes = 1;
        int no = 2;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousWestDO.java
New file
@@ -0,0 +1,88 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表实体类
 */
@Data
@TableName("com_act_neighbor_circle_fabulous_west")
public class ComActNeighborCircleFabulousWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 点赞类型(1.邻里圈 2.评论 3.回复)
     */
    private Integer type;
    /**
     * 邻里圈id
     */
    private Long circleId;
    /**
     * 点赞上级id
     */
    private Long parentId;
    /**
     * 点赞用户id
     */
    private Long userId;
    /**
     * 有效状态(1.有效 2.取消)
     */
    private Integer isEffective;
    /**
     * 点赞时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
    @Override
    public String toString() {
        return "ComActNeighborCircleFabulousDO{" + "id=" + id + ", type=" + type + ", parentId=" + parentId
            + ", userId=" + userId + ", isEffective=" + isEffective + ", createAt=" + createAt + ", updateAt="
            + updateAt + "}";
    }
    /**
     * 有效状态(1.有效 2.取消)
     */
    public interface isEffective {
        int yes = 1;
        int no = 2;
    }
    /**
     * 点赞类型(1.邻里圈 2.评论 3.回复)
     */
    public interface type {
        int llq = 1;
        int pl = 2;
        int hf = 3;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicWestDO.java
New file
@@ -0,0 +1,78 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表实体类
 */
@Data
@TableName("com_act_neighbor_circle_topic_west")
public class ComActNeighborCircleTopicWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 话题名称
     */
    private String name;
    /**
     * 状态(1.启用 2.禁用)
     */
    private Integer status;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 创建人
     */
    private Long createBy;
    /**
     * 热度
     */
    private Long hotNum;
    /**
     * 邻里圈数量
     */
    private Integer count;
    /**
     * 状态(1.启用  2.禁用)
     */
    public interface status{
        int yes = 1;
        int no = 2;
    }
    @Override
    public String toString() {
        return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="
            + createAt + ", createBy=" + createBy + "}";
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java
New file
@@ -0,0 +1,168 @@
package com.panzhihua.service_community.model.dos;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表实体类
 */
@Data
@TableName("com_act_neighbor_circle_west")
public class ComActNeighborCircleWestDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 发布人id
     */
    private Long releaseId;
    /**
     * 发布人电话
     */
    private String releasePhone;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 发布内容
     */
    private String releaseContent;
    /**
     * 发布图片
     */
    private String releaseImages;
    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    private Integer status;
    /**
     * 驳回原因
     */
    private String refuseReason;
    /**
     * 评论数
     */
    private Integer commentNum;
    /**
     * 点赞数
     */
    private Integer fabulousNum;
    /**
     * 转发数
     */
    private Integer forwardNum;
    /**
     * 浏览量
     */
    private Integer viewsNum;
    /**
     * 是否为精品帖(1.是 2.否)
     */
    private Integer isBoutique;
    /**
     * 发布时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 最后回复时间
     */
    private Date replyAt;
    /**
     * 近3天评论数
     */
    private Integer lastCommentNum;
    /**
     * 近3天评论数
     */
    private Integer lastFabulousNum;
    /**
     * 近3天评论数
     */
    private Integer lastViewsNum;
    /**
     * 话题id
     */
    private Long topicId;
    /**
     * 发布类型(1.小程序发布 2.后台发布)
     */
    private Integer type;
    /**
     * 热度
     */
    private Long hotNum;
    /**
     * 是否已删除(1.是   2.否)
     */
    private Integer isDel;
    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
            + ", communityId=" + communityId + ", releaseContent=" + releaseContent + ", releaseImages=" + releaseImages
            + ", status=" + status + ", refuseReason=" + refuseReason + ", commentNum=" + commentNum + ", fabulousNum="
            + fabulousNum + ", forwardNum=" + forwardNum + ", isBoutique=" + isBoutique + ", createAt=" + createAt
            + "}";
    }
    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    public interface status {
        int dsh = 1;
        int xs = 2;
        int yc = 3;
        int bh = 4;
    }
    /**
     * 发布类型(1.小程序发布 2.后台发布)
     */
    public interface type {
        int mini = 1;
        int admin = 2;
    }
    /**
     * 是否已删除(1.是   2.否)
     */
    public interface isDel{
        int yes = 1;
        int no = 2;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireAnswerContentDO.java
@@ -16,7 +16,7 @@
@TableName(value = "com_act_questnaire_answer_content")
public class ComActQuestnaireAnswerContentDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = 7648337436253280726L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 问卷回答选项
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
@@ -17,7 +17,7 @@
@TableName(value = "com_act_questnaire")
public class ComActQuestnaireDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = 4525826123672211880L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 标题
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java
@@ -17,7 +17,7 @@
@TableName(value = "com_act_questnaire_sub")
public class ComActQuestnaireSubDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = 914683789736719693L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 类型 0 单选  1 多选 2 输入框 2姓名输入框 3 手机号 4 身份证 5 文字描述 6 日期选择
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
@@ -17,7 +17,7 @@
@TableName(value = "com_act_questnaire_sub_selection")
public class ComActQuestnaireSubSelectionDO extends BaseDO implements Serializable {
    private static final long serialVersionUID = -2083705916360506830L;
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 问卷题目Id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireUserAnswerDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveAnswerContentDO.java
@@ -24,7 +24,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveOperationRecordDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubDO.java
@@ -25,7 +25,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubSelectionDO.java
@@ -25,7 +25,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletChangeDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java
@@ -24,7 +24,7 @@
    /**
    * 自增id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java
@@ -17,7 +17,7 @@
@TableName(value = "com_act_work_guide")
public class ComActWorkGuideDO extends BaseDO implements Serializable {
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 办事指南标题
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideMaterialDO.java
@@ -16,7 +16,7 @@
@TableName(value = "com_act_work_guide_material")
public class ComActWorkGuideMaterialDO implements Serializable {
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 申报材料名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationMemberDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCultPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessAreaDO.java
@@ -19,7 +19,7 @@
    private static final long serialVersionUID = -6760581768682304976L;
    /** ID */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 商家ID */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessDO.java
@@ -20,7 +20,7 @@
    /**
     * 商家ID
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessIntroduceDO.java
@@ -18,7 +18,7 @@
public class ComCvtBusinessIntroduceDO implements Serializable {
    private static final long serialVersionUID = 2727023439541122421L;
    /** 主键ID */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 商家ID */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtCategoryDO.java
@@ -19,7 +19,7 @@
    /**
     * 分类id 自增
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDisabilityPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDrugPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthElderliesDO.java
@@ -27,7 +27,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java
@@ -29,7 +29,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java
@@ -27,7 +27,7 @@
    /**
     * 主键id 列: id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 名称 列: name
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthHistoryRecordDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id 列: id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 老人用户id 列: user_id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthStatisticsDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id 列: id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 年份 列: year
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java
@@ -29,7 +29,7 @@
    /**
     * 主键id 列: id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 用户id 列: user_id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComExServicemanDO.java
@@ -17,7 +17,7 @@
    /**
     * 自增 id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowIncomePeopleCopyDO.java
@@ -17,7 +17,7 @@
    /**
     * 自增 id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPeopleDO.java
@@ -18,7 +18,7 @@
    /**
     * 自增 id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPopulationDO.java
@@ -26,7 +26,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCarDO.java
@@ -18,7 +18,7 @@
public class ComMngCarDO implements Serializable {
    /** 主键 */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 社区ID */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCityDO.java
@@ -10,8 +10,8 @@
@TableName(value = "com_mng_struct_area_city")
public class ComMngCityDO {
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 城市名称 */
    private String cityName;
@@ -23,5 +23,5 @@
    private Integer provinceAdcode;
    /** 省份 id */
    private Integer provinceId;
    private Long provinceId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngDistrictDO.java
@@ -10,8 +10,8 @@
@TableName(value = "com_mng_struct_area_district")
public class ComMngDistrictDO {
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 区县名称 */
    private String districtName;
@@ -23,11 +23,11 @@
    private Integer cityAdcode;
    /** 城市 id */
    private Integer cityId;
    private Long cityId;
    /** 省份行政区划代码 */
    private Integer provinceAdcode;
    /** 省份 id */
    private Integer provinceId;
    private Long provinceId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationCommunityTagsDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -18,7 +18,7 @@
    /**
     * 自增 id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 街道id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java
@@ -23,7 +23,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngProvinceDO.java
@@ -10,8 +10,8 @@
@TableName(value = "com_mng_struct_area_province")
public class ComMngProvinceDO {
    /** 自增 id */
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 省份名称 */
    private String provinceName;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealAssetsDO.java
@@ -18,7 +18,7 @@
public class ComMngRealAssetsDO implements Serializable {
    /** 主键 */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 社区ID */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealCompanyDO.java
@@ -16,7 +16,7 @@
public class ComMngRealCompanyDO {
    /** 主键 */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /** 社区ID */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDistrictDO.java
@@ -23,8 +23,8 @@
    /**
     * 自增 id
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 区县名称
@@ -44,7 +44,7 @@
    /**
     * 城市 id
     */
    private Integer cityId;
    private Long cityId;
    /**
     * 省份行政区划代码
@@ -54,5 +54,5 @@
    /**
     * 省份 id
     */
    private Integer provinceId;
    private Long provinceId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.java
@@ -22,7 +22,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java
@@ -21,7 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java
@@ -22,7 +22,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngUserTagDO.java
@@ -21,7 +21,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesEnrollRecordDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesInoculationRecordDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java
@@ -47,11 +47,13 @@
    /**
     * 社区id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    /**
     * 街道id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerOrgTeam.java
@@ -1,5 +1,8 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -12,11 +15,13 @@
 * @since 2021-10-30 15:51:23
 */
@Data
@TableName("com_mng_volunteer_org_team")
public class ComMngVolunteerOrgTeam implements Serializable {
    private static final long serialVersionUID = -87266346603371467L;
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerServiceType.java
@@ -1,5 +1,8 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@@ -12,11 +15,13 @@
 * @since 2021-10-30 16:47:09
 */
@Data
@TableName("com_mng_volunteer_service_type")
public class ComMngVolunteerServiceType implements Serializable {
    private static final long serialVersionUID = 884034720723106601L;
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerSkill.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
@@ -17,6 +19,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccUserDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java
@@ -21,7 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsHouseDO.java
@@ -23,7 +23,7 @@
    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java
@@ -20,7 +20,7 @@
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbMemberDO.java
@@ -23,7 +23,7 @@
    /**
     * 党员在表中的id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthHistoryRecordDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthPensionerDO.java
@@ -28,7 +28,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 人口id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java
@@ -27,7 +27,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     *养老金用户id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthStatisticsDO.java
@@ -23,7 +23,7 @@
    /**
    * 主键id
    */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSentencePopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java
@@ -23,7 +23,7 @@
    /**
     * 购物车id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java
@@ -23,7 +23,7 @@
    /**
     * 商品规格id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
@@ -23,7 +23,7 @@
    /**
     * 商品id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOperLogDO.java
@@ -24,7 +24,7 @@
    /**
     * 日志主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long operId;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -23,7 +23,7 @@
    /**
     * 订单id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java
@@ -23,7 +23,7 @@
    /**
     * 订单商品id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderPayDO.java
@@ -23,7 +23,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java
@@ -23,7 +23,7 @@
    /**
     * 店铺id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopSysConfDO.java
@@ -24,7 +24,7 @@
    /**
     * 订单id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 配置名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComStreetDO.java
@@ -19,7 +19,7 @@
    /**
     * streetId
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long streetId;
    /**
     * 街道名字
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordReportDO.java
@@ -22,7 +22,7 @@
    /**
     * id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java
@@ -22,7 +22,7 @@
    /**
     * 值班表主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwSafetyWorkRecordDO.java
@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientConsultationStatisticsDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 商家id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 商家名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductCategoryDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 分类名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 产品名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductSpecificationDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 规格名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientServiceCategoryDO.java
@@ -27,7 +27,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 分类名称
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientViewStatisticsDO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 商家id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java
@@ -28,7 +28,7 @@
    /**
     * ID 列: ID
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 创建人 列: CREATE_BY
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthFeedbackDO.java
@@ -25,7 +25,7 @@
    /**
     * ID 列: ID
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 创建人 列: CREATE_BY
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/SysConfDO.java
@@ -24,7 +24,7 @@
    /**
     * 主键id 列: id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 参数名 列: name
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
@@ -291,4 +291,59 @@
     * @return
     */
    R getCourtyardBaseData(Long communityId);
    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    R getHatchBaseData(Long communityId);
    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageHatchResult(PageBaseDTO pageBaseDTO);
    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageHatchSchedule(PageBaseDTO pageBaseDTO);
    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    R getFiveAssociationsBaseData(Long communityId);
    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageSocialProjectList(PageBaseDTO pageBaseDTO);
    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageSocialOrgList(PageBaseDTO pageBaseDTO);
    /**
     * 人大代表
     * @param communityId
     * @return
     */
    R dpcBase(Long communityId);
    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    R dpcEasyPhotoList(PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
@@ -33,4 +33,20 @@
     * @param comActColumnVO
     */
    R queryLevel(ComActColumnVO comActColumnVO);
    /**
     * 修改数据
     *
     * @param comActColumnVO 实体对象
     * @return 修改结果
     */
    R updateColumn(ComActColumnVO comActColumnVO);
    /**
     * 新增数据
     *
     * @param comActColumnVO 实体对象
     * @return 新增结果
     */
    R addColumn(ComActColumnVO comActColumnVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDpcService.java
New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActDpc;
/**
 * 人大代表(ComActDpc)表服务接口
 *
 * @author makejava
 * @since 2022-06-07 10:55:32
 */
public interface ComActDpcService extends IService<ComActDpc> {
    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    R addDpc(AddDpcDTO addDpcDTO);
    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    R editDpc(EditDpcDTO editDpcDTO);
    /**
     * 删除人大代表
     * @param id
     * @return
     */
    R deleteDpc(Long id);
    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    R detailDpc(Long id);
    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    R pageDpc(PageDpcDTO pageDpcDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoHandlerService.java
@@ -2,6 +2,9 @@
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import java.util.List;
/**
 * title: 随手拍、微心愿处理人绑定表表服务接口
@@ -86,4 +89,11 @@
     */
    void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType,Long sponsorId);
    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
@@ -186,4 +186,18 @@
     * @return 社区待处理随手拍id集合
     */
    R easyPhotoNoHandleList(Long communityId);
    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    R getFeedbackList(Long id);
    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseService.java
New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActEnterprise;
/**
 * (ComActEnterprise)表服务接口
 *
 * @author makejava
 * @since 2022-05-31 10:17:02
 */
public interface ComActEnterpriseService extends IService<ComActEnterprise> {
    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    R addEnterprise(AddEnterpriseDTO addEnterpriseDTO);
    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    R editEnterprise(EditEnterpriseDTO editEnterpriseDTO);
    /**
     * 删除社区企业
     * @param id
     * @return
     */
    R deleteEnterprise(Long id);
    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    R detailEnterprise(Long id);
    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    R pageEnterprise(PageEnterpriseDTO pageEnterpriseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseTypeService.java
New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActEnterpriseType;
/**
 * (ComActEnterpriseType)表服务接口
 *
 * @author makejava
 * @since 2022-06-06 15:30:52
 */
public interface ComActEnterpriseTypeService extends IService<ComActEnterpriseType> {
    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    R addEnterpriseType(AddEnterpriseTypeDTO addEnterpriseTypeDTO);
    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    R editEnterpriseType(EditEnterpriseTypeDTO enterpriseTypeDTO);
    /**
     * 删除服务分类
     * @param id
     * @return
     */
    R deleteEnterpriseType(Long id);
    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    R detailEnterpriseType(Long id);
    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    R pageEnterpriseType(PageEnterpriseTypeDTO pageEnterpriseTypeDTO);
    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    R getEnterpriseTypeList(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java
@@ -39,7 +39,7 @@
     */
    R delete(ComActFourMemberVO comActFourMemberVO);
    R get(Integer id);
    R get(Long id);
    /**
     * 小程序四长四员查询居民列表
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseWestService.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表服务类
 */
public interface ComActNeighborCircleBrowseWestService extends IService<ComActNeighborCircleBrowseWestDO> {
    /**
     * 添加邻里圈浏览记录
     *
     * @param neighborId
     *            邻里圈id
     * @param userId
     *            用户id
     */
    void addBrowseRecord(Long neighborId, Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentReplyWestService.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表服务类
 */
public interface ComActNeighborCircleCommentReplyWestService extends IService<ComActNeighborCircleCommentReplyWestDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentWestService.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表服务类
 */
public interface ComActNeighborCircleCommentWestService extends IService<ComActNeighborCircleCommentWestDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleFabulousWestService.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表服务类
 */
public interface ComActNeighborCircleFabulousWestService extends IService<ComActNeighborCircleFabulousWestDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
@@ -4,7 +4,6 @@
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicWestService.java
New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicWestDO;
/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表服务类
 */
public interface ComActNeighborCircleTopicWestService extends IService<ComActNeighborCircleTopicWestDO> {
    /**
     * 分页查询邻里圈话题列表
     *
     * @param circleTopicAdminDTO
     *            请求参数
     * @return 邻里圈话题列表
     */
    R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
    /**
     * 添加邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 添加结果
     */
    R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
    /**
     * 编辑邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    R getNeighborTopicByApp(Long communityId,Integer isZero,String name);
    /**
     * 小程序-用户新增话题
     * @param circleTopicAppDTO 请求参数
     * @return  新增结果
     */
    R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleWestService.java
New file
@@ -0,0 +1,222 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleWestDO;
/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表服务类
 */
public interface ComActNeighborCircleWestService extends IService<ComActNeighborCircleWestDO> {
    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);
    /**
     * 用户发布邻里圈审核
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return 发布结果
     */
    R addNeighborByApp(AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);
    /**
     * 查看邻里圈详情
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈详情
     */
    R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
    /**
     * 管理后台查询邻里圈列表
     *
     * @return
     */
    R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    /**
     * 邻里圈_添加
     *
     * @param addNeighborCircleAdminVO
     * @return
     */
    R addNeighborByAdmin(AddNeighborCircleAdminVO addNeighborCircleAdminVO);
    /**
     * 邻里圈_修改
     *
     * @param editNeighborCircleAdminVO
     * @return
     */
    R changeStatusByAdmin(EditNeighborCircleAdminVO editNeighborCircleAdminVO);
    /**
     * 后台删除未审核的邻里圈(待审核状态不可删除,显示、隐藏、已驳回的都可以删除)
     *
     * @return
     */
    R deleteByAdmin(Long id);
    /**
     * 查看邻里圈基础_详情
     *
     * @param id
     *            邻里圈id
     * @return
     */
    R detailNeighborByAdmin(Long id);
    /**
     * 邻里圈的所有评论_分页
     *
     * @param detailNeighborAllCommentByAdminDTO
     *            参数
     * @return
     */
    R detailNeighborAllCommentByAdmin(DetailNeighborAllCommentByAdminDTO detailNeighborAllCommentByAdminDTO);
    /**
     * 评论的状态_修改
     *
     * @param changeStatusComment
     * @return
     */
    R changeCommentStatusByAdmin(ChangeCommentStatusByAdminVO changeStatusComment);
    /**
     * 邻里圈评论_详情
     *
     * @param id
     *            评论id
     * @return
     */
    R detailNeighborCommentByAdmin(Long id);
    /**
     * 邻里圈评论回复_分页
     *
     * @param dto
     *            参数
     * @return
     */
    R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto);
    /**
     * 邻里圈评论回复_基本详情
     *
     * @param id
     * @return
     */
    R detailNeighborCommentReply(Long id);
    /**
     * 评论的回复状态_修改
     *
     * @param changeStatusReplyVO
     * @return
     */
    R changeCommentReplyStatusByAdmin(ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
    /**
     * 用户查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);
    /**
     * 邻里圈点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 点赞结果
     */
    R neighborFabulousByApp(ComActNeighborFabulousAppDTO fabulousAppDTO);
    /**
     * 邻里圈转发
     *
     * @param forwardAppDTO
     *            请求参数
     * @return 转发结果
     */
    R neighborForwardByApp(ComActNeighborForwardAppDTO forwardAppDTO);
    /**
     * 邻里圈评论
     *
     * @param commentAppDTO
     *            请求参数
     * @return 评论结果
     */
    R neighborCommentByApp(ComActNeighborCommentAppDTO commentAppDTO);
    /**
     * 邻里圈回复
     *
     * @param replyAppDTO
     *            请求参数
     * @return 回复结果
     */
    R neighborReplyByApp(ComActNeighborReplyAppDTO replyAppDTO);
    /**
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     *
     * @return 执行结果
     */
    R timeTaskCircleFlow();
    /**
     * 邻里圈取消点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 取消点赞结果
     */
    R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO);
    /**
     * 添加邻里圈浏览记录
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return 返回参数
     */
    R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
    /**
     * 分页查询评论下所有回复
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return 回复列表
     */
    R neighborCommentReplyByApp(ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
    /**
     * 小程序-删除邻里圈
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -92,7 +92,7 @@
     * 
     * @return 社区列表
     */
    R getCommunityAllList(String areaCode);
    R getCommunityAllList(String appId);
    /**
     * 根据名字查询所有社区列表
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditScheduleService.java
New file
@@ -0,0 +1,14 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 15:10:48
 */
public interface ComActSocialOrgHatchAuditScheduleService extends IService<ComActSocialOrgHatchAuditSchedule> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditService.java
New file
@@ -0,0 +1,73 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
public interface ComActSocialOrgHatchAuditService extends IService<ComActSocialOrgHatchAudit> {
    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    R pageHatchAudit(PageSocialOrgHatchAuditDTO pageHatchAuditDTO);
    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    R detailHatchAudit(Long id);
    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    R updateHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO);
    /**
     * 获取孵化流程配置
     * @return
     */
    R getHatchAuditProcess();
    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    R putHatchAuditProcess(HatchAuditProcessDTO processDTO);
    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    R addHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO);
    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    R getHatchAuditSchedule(Long userId);
    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    R deleteHatchAudit(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchService.java
New file
@@ -0,0 +1,45 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
/**
 * 社会组织孵化表(ComActSocialOrgHatch)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
public interface ComActSocialOrgHatchService extends IService<ComActSocialOrgHatch> {
    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    R pageOrgHatch(PageSocialOrgHatchDTO pageHatchDTO);
    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    R detailOrgHatch(Long id);
    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    R updateOrgHatchStatus(Long id, Integer status);
    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    R deleteOrgHatch(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java
@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.service_community.entity.ComActSocialProject;
/**
@@ -23,9 +26,10 @@
    /**
     * 小程序获取详情
     * @param id
     * @param userId
     * @return
     */
    R getByApplet(Long id);
    R getByApplet(Long id, Long userId);
    /**
     * 小程序获取详情
@@ -40,4 +44,34 @@
     * @return
     */
    R getProject(CommonPage commonPage);
    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    R updateProject(SocialProjectVO socialProjectVO);
    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    R pageProjectSignList(PageProjectSignListDTO pageProjectSignListDTO);
    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    R signProject(Long projectId, Long userId);
    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    R pageProjectWhichIsSignedByUser(PageProjectDTO pageProjectDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java
@@ -38,5 +38,5 @@
     * @param provinceAdcode
     * @return
     */
    R getCityTreeByProvinceCode(Integer provinceAdcode);
    R getCityTreeByProvinceCode(Integer provinceAdcode, String areaCode);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java
@@ -73,6 +73,7 @@
    /**
     * 方便手动调用批量更新
     * @param areaCode
     */
    void updateAllHouseUnionAppCode();
    void updateAllHouseUnionAppCode(String areaCode);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -14,17 +14,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -36,15 +26,21 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -57,32 +53,43 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.FourMemberOrgRelationVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActCommitteeDao;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActDiscussDAO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
import com.panzhihua.service_community.dao.ComActFourMemberDao;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
import com.panzhihua.service_community.dao.ComFmsServiceDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import lombok.extern.slf4j.Slf4j;
@@ -150,6 +157,12 @@
    private ComFmsServiceDAO comFmsServiceDAO;
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
    @Resource
    private ComActSocialOrgHatchDAO comActSocialOrgHatchDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActEnterpriseDAO comActEnterpriseDAO;
    /**
     * 大数据分析平台-居民自治
@@ -1217,6 +1230,154 @@
        return R.ok(statisticsInfo);
    }
    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getHatchBaseData(Long communityId) {
        ComActDO comActDO = comActDAO.selectById(communityId);
        BigScreenHatchStatisticsInfo statisticsInfo = comActSocialOrgHatchDAO.getHatchBaseData(communityId, comActDO.getStreetId());
        //孵化进程占比圆形图数据
        List<StatisticsCommVO> hatchScheduleCircleData = comActSocialOrgHatchDAO.getHatchScheduleCircleData(comActDO.getStreetId());
        statisticsInfo.setHatchScheduleCircleData(hatchScheduleCircleData);
        //孵化状态占比柱形数据
        List<StatisticsCommVO> hatchStatusColumnData = comActSocialOrgHatchDAO.getHatchStatusColumnData(comActDO.getStreetId());
        statisticsInfo.setHatchStatusColumnData(hatchStatusColumnData);
        //街道组织占比柱形数据
        List<StatisticsCommVO> streetOrgColumnData = comActSocialOrgHatchDAO.getStreetOrgColumnData(comActDO.getStreetId());
        if (nonNull(streetOrgColumnData) && !streetOrgColumnData.isEmpty()) {
            streetOrgColumnData.forEach(e -> e.setStatisticsCommVOS(comActSocialOrgHatchDAO.getStreetOrgChildData(e.getFiled())));
        }
        statisticsInfo.setStreetOrgColumnData(streetOrgColumnData);
        return R.ok(statisticsInfo);
    }
    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageHatchResult(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageHatchResult(page, pageBaseDTO, comActDO.getStreetId()));
    }
    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageHatchSchedule(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageHatchSchedule(page, pageBaseDTO, comActDO.getStreetId()));
    }
    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getFiveAssociationsBaseData(Long communityId) {
        ComActDO comActDO = comActDAO.selectById(communityId);
        BigScreenFiveAssociationsStatisticsInfo statisticsInfo = comActSocialProjectDao.getFiveAssociationsBaseData(communityId, comActDO.getStreetId());
        //社区企业服务分类占比圆形图数据
        Integer enterpriseNum = statisticsInfo.getEnterpriseNum();
        List<StatisticsCommVO> enterpriseServiceTypeCircleData = comActEnterpriseDAO.getEnterpriseServiceTypeCircleData(communityId);
        if (nonNull(enterpriseServiceTypeCircleData) && !enterpriseServiceTypeCircleData.isEmpty() && enterpriseNum > 0) {
            enterpriseServiceTypeCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(enterpriseNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setEnterpriseServiceTypeCircleData(enterpriseServiceTypeCircleData);
        //社区工作者年龄段占比圆形图数据
        List<StatisticsCommVO> socialWorkerAgeStageCircleData = comActEnterpriseDAO.getSocialWorkerAgeStageCircleData(communityId);
        Integer socialWorkerNum = statisticsInfo.getSocialWorkerNum();
        if (nonNull(socialWorkerAgeStageCircleData) && !socialWorkerAgeStageCircleData.isEmpty() && socialWorkerNum > 0) {
            socialWorkerAgeStageCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(socialWorkerNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setSocialWorkerAgeStageCircleData(socialWorkerAgeStageCircleData);
        //社区工作者服务分类占比圆形图数据
        List<StatisticsCommVO> socialWorkerServiceTypeCircleData = comActEnterpriseDAO.getSocialWorkerServiceTypeCircleData(communityId);
        if (nonNull(socialWorkerServiceTypeCircleData) && !socialWorkerServiceTypeCircleData.isEmpty() && socialWorkerNum > 0) {
            socialWorkerServiceTypeCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(socialWorkerNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setSocialWorkerServiceTypeCircleData(socialWorkerServiceTypeCircleData);
        return R.ok(statisticsInfo);
    }
    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageSocialProjectList(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialProjectDao.pageSocialProjectList(page, pageBaseDTO, comActDO.getStreetId()));
    }
    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageSocialOrgList(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageSocialOrgList(page, pageBaseDTO, comActDO.getStreetId()));
    }
    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @Override
    public R dpcBase(Long communityId) {
        BigScreenDpcStatisticsInfo statisticsInfo = comActEasyPhotoDAO.selectDpcBaseData(communityId);
        //随手拍新增折线数据
        List<StatisticsCommVO> easyPhotoAddPolylineData = comActEasyPhotoDAO.getEasyPhotoAddPolylineDataForDpc(communityId);
        statisticsInfo.setEasyPhotoAddPolylineData(easyPhotoAddPolylineData);
        //随手拍累计折线数据
        List<StatisticsCommVO> easyPhotoTotalPolylineData = new ArrayList<>();
        easyPhotoAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActEasyPhotoDAO.getEasyPhotoTotalPolylineDateForDpc(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            easyPhotoTotalPolylineData.add(temp);
        });
        statisticsInfo.setEasyPhotoTotalPolylineData(easyPhotoTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @Override
    public R dpcEasyPhotoList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActEasyPhotoDAO.dpcEasyPhotoList(page, pageBaseDTO));
    }
    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -17,6 +17,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -91,7 +92,10 @@
    private ComActDAO comActDAO;
    @Resource
    private ComPbCheckUnitDao comPbCheckUnitDao;
    @Resource
    private ComActSocialProjectDao comActSocialProjectDao;
    @Resource
    private ComStreetDAO comStreetDAO;
    /**
     * 新增社区活动
@@ -236,7 +240,19 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
        Integer type = comActActivityVO.getType();
        IPage<ComActActivityVO> iPage = null;
        if (nonNull(type) && type.equals(4)) {
            if (nonNull(comActActivityVO.getCommunityId())) {
                ComActDO comActDO = comActDAO.selectById(comActActivityVO.getCommunityId());
                if (nonNull(comActDO)) {
                    comActActivityVO.setStreetId(comActDO.getStreetId());
                }
            }
            iPage = comActActivityDAO.pageProjectActivity(page, comActActivityVO);
        } else {
            iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
        }
//        List<ComActActivityVO> records = iPage.getRecords();
//        if (!ObjectUtils.isEmpty(records)) {
//            records.forEach(comActActivityVO1 -> {
@@ -1132,6 +1148,7 @@
    @Override
    public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
        try {
            comActActivityTypeVO.setId(Snowflake.getId());
            this.baseMapper.addActivityType(comActActivityTypeVO);
        } catch (Exception e) {
            log.error("添加活动类型错误【{}】", e.getMessage());
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
@@ -1,5 +1,19 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,10 +21,13 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.dao.ComActColumnDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
import com.panzhihua.service_community.dao.ComActColumnDao;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.service.ComActColumnService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -29,6 +46,10 @@
    private ComActColumnDao comActColumnDao;
    @Resource
    private ComActAnnouncementDao comActAnnouncementDao;
    @Resource
    private ComActSocialWorkerDao comActSocialWorkerDao;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActColumnDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -39,12 +60,102 @@
        if(!comActAnnouncementDao.selectList(new QueryWrapper<ComActAnnouncement>().lambda().eq(ComActAnnouncement::getColumnId,id)).isEmpty()){
            return R.fail("当前类型无法删除,请先处理绑定数据");
        }
        ComActColumn comActColumn = comActColumnDao.selectById(id);
        if (nonNull(comActColumn) && comActColumn.getType().equals(2)) {
            //社工技能
            updateWorkerSkill(id);
        }
        return R.ok(comActColumnDao.deleteById(id));
    }
    @Override
    public R queryLevel(ComActColumnVO comActColumnVO) {
        Integer type = comActColumnVO.getType();
        Long communityId = comActColumnVO.getCommunityId();
        if (nonNull(type) && type.equals(4) && nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (nonNull(comActDO)) {
                comActColumnVO.setStreetId(comActDO.getStreetId());
            }
        }
        return R.ok(this.comActColumnDao.queryLevel(comActColumnVO));
    }
    /**
     * 修改数据
     *
     * @param comActColumnVO 实体对象
     * @return 修改结果
     */
    @Override
    public R updateColumn(ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn = this.baseMapper.selectById(comActColumnVO.getId());
        BeanUtils.copyProperties(comActColumnVO, comActColumn);
        int result = this.baseMapper.updateById(comActColumn);
        if (result > 0) {
            if (comActColumn.getType().equals(2)) {
                //社工技能
                updateWorkerSkill(comActColumn.getId());
            }
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 新增数据
     *
     * @param comActColumnVO 实体对象
     * @return 新增结果
     */
    @Override
    public R addColumn(ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn = new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO, comActColumn);
        Long communityId = comActColumnVO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (nonNull(comActDO)) {
                comActColumn.setStreetId(comActDO.getStreetId());
            }
        }
        int result = this.baseMapper.insert(comActColumn);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    private void updateWorkerSkill(Long id) {
        List<ComActSocialWorker> workerList = comActSocialWorkerDao.selectIncludeSkillWorkerList(id);
        if (!workerList.isEmpty()) {
            workerList.forEach(e -> {
                String skillType = e.getSkillType();
                if (isNotBlank(skillType)) {
                    List<String> skillList = Arrays.asList(skillType.split(","));
                    List<String> list = new ArrayList<String>(skillList);
                    list.remove(id.toString());
                    StringBuilder sb = new StringBuilder();
                    StringBuilder sb1 = new StringBuilder();
                    for (int i = 0; i < list.size(); i++) {
                        String skillId = list.get(i);
                        ComActColumn skillColumn = comActColumnDao.selectById(skillId);
                        if (i < list.size() - 1) {
                            sb.append(skillId);
                            sb.append(",");
                            sb1.append(skillColumn.getName());
                            sb1.append(",");
                        } else {
                            sb.append(skillId);
                            sb1.append(skillColumn.getName());
                        }
                    }
                    e.setSkillType(sb.toString());
                    e.setSkillTypeName(sb1.toString());
                    comActSocialWorkerDao.updateById(e);
                }
            });
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -995,13 +995,9 @@
            comActDiscussOptionUserDO.setUserId(userId);
            comActDiscussOptionUserDO.setDiscussOptionId(optionId);
            comActDiscussOptionUserDO.setDiscussId(discussId);
            comActDiscussOptionUserDOList.add(comActDiscussOptionUserDO);
            comActDiscussOptionUserDAO.insert(comActDiscussOptionUserDO);
        });
        int result = comActDiscussOptionUserDAO.batchInsert(comActDiscussOptionUserDOList);
        if (result > 0) {
            return R.ok();
        }
        return R.fail();
        return R.ok();
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java
New file
@@ -0,0 +1,146 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.user.SysUserVO;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActDpcDAO;
import com.panzhihua.service_community.entity.ComActDpc;
import com.panzhihua.service_community.service.ComActDpcService;
import javax.annotation.Resource;
/**
 * 人大代表(ComActDpc)表服务实现类
 *
 * @author makejava
 * @since 2022-06-07 10:55:32
 */
@Service("comActDpcService")
public class ComActDpcServiceImpl extends ServiceImpl<ComActDpcDAO, ComActDpc> implements ComActDpcService {
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @Override
    public R addDpc(AddDpcDTO addDpcDTO) {
        ComActDpc dpc = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActDpc>()
                .eq(ComActDpc::getPhone, addDpcDTO.getPhone())
                .eq(ComActDpc::getCommunityId, addDpcDTO.getCommunityId()));
        if (nonNull(dpc)) {
            if (dpc.getIsDel()) {
                this.baseMapper.deleteById(dpc.getId());
            } else {
                return R.fail("手机号已存在");
            }
        }
        dpc = new ComActDpc();
        BeanUtils.copyProperties(addDpcDTO, dpc);
        int result = this.baseMapper.insert(dpc);
        if (result > 0) {
            refreshAssociateUserCash(addDpcDTO.getPhone());
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @Override
    public R editDpc(EditDpcDTO editDpcDTO) {
        ComActDpc dpc = this.baseMapper.selectById(editDpcDTO.getId());
        if (isNull(dpc)) {
            return R.fail("资源不存在");
        }
        if (!dpc.getPhone().equals(editDpcDTO.getPhone())) {
            ComActDpc dpc1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActDpc>()
                    .eq(ComActDpc::getPhone, editDpcDTO.getPhone())
                    .eq(ComActDpc::getCommunityId, editDpcDTO.getCommunityId()));
            if (nonNull(dpc1)) {
                if (dpc1.getIsDel()) {
                    this.baseMapper.deleteById(dpc1.getId());
                } else {
                    return R.fail("手机号已存在");
                }
            }
        }
        BeanUtils.copyProperties(editDpcDTO, dpc);
        int result = this.baseMapper.updateById(dpc);
        if (result > 0) {
            refreshAssociateUserCash(editDpcDTO.getPhone());
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @Override
    public R deleteDpc(Long id) {
        ComActDpc dpc = this.baseMapper.selectById(id);
        if (isNull(dpc)) {
            return R.fail("资源不存在");
        }
        dpc.setIsDel(true);
        int result = this.baseMapper.updateById(dpc);
        if (result > 0) {
            refreshAssociateUserCash(dpc.getPhone());
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    private void refreshAssociateUserCash(String phone) {
        SysUserVO sysUser = this.baseMapper.selectUser(phone);
        if (nonNull(sysUser)) {
            String userKey = UserConstants.LOGIN_USER_INFO + sysUser.getUserId();
            stringRedisTemplate.delete(userKey);
        }
    }
    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @Override
    public R detailDpc(Long id) {
        return R.ok(this.baseMapper.detailDpc(id));
    }
    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @Override
    public R pageDpc(PageDpcDTO pageDpcDTO) {
        Page page = new Page<>();
        page.setSize(pageDpcDTO.getPageSize());
        page.setCurrent(pageDpcDTO.getPageNum());
        return R.ok(this.baseMapper.pageDpc(page, pageDpcDTO));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -99,7 +99,9 @@
        comActDynVO.setReadNum(count);
        if (nonNull(category) && !category.equals(3)) {
            ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
            comActDynVO.setCommunityName(comActDO.getName());
            if(comActDO!=null){
                comActDynVO.setCommunityName(comActDO.getName());
            }
        }
        return R.ok(comActDynVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
@@ -11,6 +12,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.Date;
import java.util.List;
/**
 * title: 随手拍、微心愿处理人绑定表表服务实现类
@@ -140,4 +142,15 @@
        easyPhotoHandler.setServiceType(serviceType);
        this.baseMapper.insert(easyPhotoHandler);
    }
    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    @Override
    public List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType) {
        return this.baseMapper.selectHandleRecord(serviceId, serviceType);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
@@ -880,4 +881,45 @@
        return R.ok(this.baseMapper.easyPhotoNoHandleIds(communityId));
    }
    /**
     * 获取人大代表反馈记录
     * @param id 随手拍id
     * @return
     */
    @Override
    public R getFeedbackList(Long id) {
        return R.ok(comActEasyPhotoFeedbackMapper.getPhotoFeedbackListForDpc(id));
    }
    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @Override
    public R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO) {
        Date nowDate = new Date();
        // 操作类型 1审核通过 2驳回 3反馈 4完成随手拍
        ComActEasyPhotoDO cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
        if (cmActEasyPhotoDO == null) {
            return R.fail("未查询到随手拍记录");
        }
        if (!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)) {
            return R.fail("该随手拍不是进行中状态,不可进行反馈");
        }
        // 给随手拍新增反馈信息
        ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
        photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
        photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
        photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
        photoFeedbackDO.setType(2);
        photoFeedbackDO.setCreateAt(nowDate);
        photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
        int result = comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
        if (result > 0) {
            return R.ok();
        }
        return R.fail();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseServiceImpl.java
New file
@@ -0,0 +1,106 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
import com.panzhihua.service_community.entity.ComActEnterprise;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActEnterpriseService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import static java.util.Objects.isNull;
/**
 * (ComActEnterprise)表服务实现类
 *
 * @author makejava
 * @since 2022-05-31 10:17:02
 */
@Service("comActEnterpriseService")
public class ComActEnterpriseServiceImpl extends ServiceImpl<ComActEnterpriseDAO, ComActEnterprise>
    implements ComActEnterpriseService {
    @Resource
    private ComActDAO comActDAO;
    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @Override
    public R addEnterprise(AddEnterpriseDTO addEnterpriseDTO) {
        ComActDO comActDO = comActDAO.selectById(addEnterpriseDTO.getCommunityId());
        ComActEnterprise enterprise = new ComActEnterprise();
        BeanUtils.copyProperties(addEnterpriseDTO, enterprise);
        enterprise.setStreetId(comActDO.getStreetId());
        int result = this.baseMapper.insert(enterprise);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @Override
    public R editEnterprise(EditEnterpriseDTO editEnterpriseDTO) {
        ComActEnterprise enterprise = this.baseMapper.selectById(editEnterpriseDTO.getId());
        if (isNull(enterprise)) {
            return R.fail("资源不存在");
        }
        ComActDO comActDO = comActDAO.selectById(editEnterpriseDTO.getCommunityId());
        BeanUtils.copyProperties(editEnterpriseDTO, enterprise);
        enterprise.setStreetId(comActDO.getStreetId());
        int result = this.baseMapper.updateById(enterprise);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @Override
    public R deleteEnterprise(Long id) {
        this.baseMapper.deleteById(id);
        return R.ok();
    }
    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @Override
    public R detailEnterprise(Long id) {
        return R.ok(this.baseMapper.detailEnterprise(id));
    }
    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @Override
    public R pageEnterprise(PageEnterpriseDTO pageEnterpriseDTO) {
        Page page = new Page<>();
        page.setSize(pageEnterpriseDTO.getPageSize());
        page.setCurrent(pageEnterpriseDTO.getPageNum());
        return R.ok(this.baseMapper.pageEnterprise(page, pageEnterpriseDTO));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseTypeServiceImpl.java
New file
@@ -0,0 +1,142 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
import com.panzhihua.service_community.dao.ComActEnterpriseTypeDAO;
import com.panzhihua.service_community.entity.ComActEnterprise;
import com.panzhihua.service_community.entity.ComActEnterpriseType;
import com.panzhihua.service_community.service.ComActEnterpriseTypeService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
/**
 * (ComActEnterpriseType)表服务实现类
 *
 * @author makejava
 * @since 2022-06-06 15:30:52
 */
@Service("comActEnterpriseTypeService")
public class ComActEnterpriseTypeServiceImpl extends ServiceImpl<ComActEnterpriseTypeDAO, ComActEnterpriseType>
    implements ComActEnterpriseTypeService {
    @Resource
    private ComActEnterpriseDAO comActEnterpriseDAO;
    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @Override
    public R addEnterpriseType(AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActEnterpriseType>()
                .eq(ComActEnterpriseType::getCommunityId, addEnterpriseTypeDTO.getCommunityId())
                .eq(ComActEnterpriseType::getName, addEnterpriseTypeDTO.getName()));
        if (nonNull(enterpriseType)) {
            return R.fail("分类名称已存在");
        }
        enterpriseType = new ComActEnterpriseType();
        BeanUtils.copyProperties(addEnterpriseTypeDTO, enterpriseType);
        int result = this.baseMapper.insert(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @Override
    public R editEnterpriseType(EditEnterpriseTypeDTO enterpriseTypeDTO) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectById(enterpriseTypeDTO.getId());
        if (isNull(enterpriseType)) {
            return R.fail("资源不存在");
        }
        if (!enterpriseType.getName().equals(enterpriseTypeDTO.getName())) {
            ComActEnterpriseType enterpriseType2 = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActEnterpriseType>()
                    .eq(ComActEnterpriseType::getCommunityId, enterpriseTypeDTO.getCommunityId())
                    .eq(ComActEnterpriseType::getName, enterpriseTypeDTO.getName()));
            if (nonNull(enterpriseType2)) {
                return R.fail("分类名称已存在");
            }
        }
        BeanUtils.copyProperties(enterpriseTypeDTO, enterpriseType);
        int result = this.baseMapper.updateById(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @Override
    public R deleteEnterpriseType(Long id) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectById(id);
        if (isNull(enterpriseType)) {
            return R.fail("资源不存在");
        }
        List<ComActEnterprise> enterpriseList = comActEnterpriseDAO.selectList(new LambdaQueryWrapper<ComActEnterprise>().eq(ComActEnterprise::getType, id));
        if (nonNull(enterpriseList) && !enterpriseList.isEmpty()) {
            return R.fail("该分类已被引用,无法删除");
        }
        enterpriseType.setIsDel(true);
        int result = this.baseMapper.updateById(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @Override
    public R detailEnterpriseType(Long id) {
        return R.ok(this.baseMapper.detailEnterpriseType(id));
    }
    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @Override
    public R pageEnterpriseType(PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        Page page = new Page<>();
        page.setSize(pageEnterpriseTypeDTO.getPageSize());
        page.setCurrent(pageEnterpriseTypeDTO.getPageNum());
        return R.ok(this.baseMapper.pageEnterpriseType(page, pageEnterpriseTypeDTO));
    }
    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @Override
    public R getEnterpriseTypeList(Long communityId) {
        return R.ok(this.baseMapper.getEnterpriseTypeList(communityId));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -78,7 +78,9 @@
    @Override
    public R insert(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
            if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard()))>0){
            if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda()
                    .eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard())
                    .eq(ComActFourMember::getCommunityId, comActFourMemberVO.getCommunityId()))>0){
                return R.fail("身份证号重复");
            }
            ComActFourMember comActFourMember=new ComActFourMember();
@@ -194,7 +196,7 @@
    }
    @Override
    public R get(Integer id) {
    public R get(Long id) {
        return R.ok(comActFourMemberDao.getById(id));
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
@@ -6,9 +6,11 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActDpcDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,6 +36,8 @@
import com.panzhihua.service_community.model.dos.ComActMessageDO;
import com.panzhihua.service_community.service.ComActMessageService;
import static java.util.Objects.isNull;
@Service
public class ComActMessageServiceImpl extends ServiceImpl<ComActMessageDAO, ComActMessageDO>
    implements ComActMessageService {
@@ -47,6 +51,8 @@
    private ComActDAO comActDAO;
    @Resource
    private UserService userService;
    @Resource
    private ComActDpcDAO comActDpcDAO;
    @Override
    public R addMessage(ComActMessageVO comActMessageVO) {
@@ -66,6 +72,13 @@
                return R.fail();
            phone = party.getPhone();
            sendtoUserName = party.getName();
        } else if (type == 3) {
            ComActDpcVO dpcVO = comActDpcDAO.detailDpc(comActMessageVO.getSendtoUserId());
            if (isNull(dpcVO)) {
                return R.fail();
            }
            phone = dpcVO.getPhone();
            sendtoUserName = dpcVO.getName();
        }
        if (ObjectUtils.isEmpty(phone))
            return R.fail("未找到联系方式");
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseWestServiceImpl.java
New file
@@ -0,0 +1,38 @@
package com.panzhihua.service_community.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActNeighborCircleBrowseWestDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleBrowseWestDO;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-28 13:40:53
 * @describe 邻里圈浏览记录表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleBrowseWestServiceImpl
    extends ServiceImpl<ComActNeighborCircleBrowseWestDAO, ComActNeighborCircleBrowseWestDO>
    implements ComActNeighborCircleBrowseWestService {
    /**
     * 添加邻里圈浏览记录
     *
     * @param neighborId
     *            邻里圈id
     * @param userId
     *            用户id
     */
    public void addBrowseRecord(Long neighborId, Long userId) {
        ComActNeighborCircleBrowseWestDO circleBrowseDO = new ComActNeighborCircleBrowseWestDO();
        circleBrowseDO.setNeighborId(neighborId);
        circleBrowseDO.setUserId(userId);
        this.baseMapper.insert(circleBrowseDO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentReplyWestServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActNeighborCircleCommentReplyWestDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyWestDO;
import com.panzhihua.service_community.service.ComActNeighborCircleCommentReplyWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:45
 * @describe 邻里圈评论回复表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleCommentReplyWestServiceImpl
    extends ServiceImpl<ComActNeighborCircleCommentReplyWestDAO, ComActNeighborCircleCommentReplyWestDO>
    implements ComActNeighborCircleCommentReplyWestService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentWestServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActNeighborCircleCommentWestDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentWestDO;
import com.panzhihua.service_community.service.ComActNeighborCircleCommentWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:33
 * @describe 邻里圈评论表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleCommentWestServiceImpl
    extends ServiceImpl<ComActNeighborCircleCommentWestDAO, ComActNeighborCircleCommentWestDO>
    implements ComActNeighborCircleCommentWestService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleFabulousWestServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActNeighborCircleFabulousWestDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousWestDO;
import com.panzhihua.service_community.service.ComActNeighborCircleFabulousWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-28 09:21:55
 * @describe 邻里圈点赞表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleFabulousWestServiceImpl
    extends ServiceImpl<ComActNeighborCircleFabulousWestDAO, ComActNeighborCircleFabulousWestDO>
    implements ComActNeighborCircleFabulousWestService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -484,6 +484,7 @@
            ComActNeighborCircleCommentDO circleCommentDO =
                comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            if (circleCommentDO != null) {
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
                //计算需要增加的热度值
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -4,7 +4,6 @@
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -14,9 +13,7 @@
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicWestServiceImpl.java
New file
@@ -0,0 +1,141 @@
package com.panzhihua.service_community.service.impl;
import java.util.Date;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicWestMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicWestDO;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleTopicWestServiceImpl
    extends ServiceImpl<ComActNeighborCircleTopicWestMapper, ComActNeighborCircleTopicWestDO>
    implements ComActNeighborCircleTopicWestService {
    /**
     * 分页查询邻里圈话题列表
     *
     * @param circleTopicAdminDTO
     *            请求参数
     * @return 邻里圈话题列表
     */
    @Override
    public R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        return R.ok(this.baseMapper.pageNeighborTopicByAdmin(
            new Page(circleTopicAdminDTO.getPageNum(), circleTopicAdminDTO.getPageSize()), circleTopicAdminDTO));
    }
    /**
     * 添加邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 添加结果
     */
    @Override
    public R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        ComActNeighborCircleTopicWestDO circleTopicDO =
            this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicWestDO>().lambda()
                .eq(ComActNeighborCircleTopicWestDO::getName, addCircleTopicAdminDTO.getName())
                .eq(ComActNeighborCircleTopicWestDO::getCommunityId, addCircleTopicAdminDTO.getCommunityId()));
        if (circleTopicDO != null) {
            return R.fail("该话题已存在");
        }
        circleTopicDO = new ComActNeighborCircleTopicWestDO();
        BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
        circleTopicDO.setCreateAt(new Date());
        circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());
        if (this.baseMapper.insert(circleTopicDO) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    /**
     * 编辑邻里圈话题
     *
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @Override
    public R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        ComActNeighborCircleTopicWestDO circleTopicDO = this.baseMapper.selectById(addCircleTopicAdminDTO.getId());
        if (circleTopicDO == null) {
            return R.fail("未找到邻里圈话题记录");
        }
        if (StringUtils.isNotEmpty(addCircleTopicAdminDTO.getName())) {
            ComActNeighborCircleTopicWestDO oldCircleTopicDO =
                this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicWestDO>().lambda()
                    .eq(ComActNeighborCircleTopicWestDO::getName, addCircleTopicAdminDTO.getName())
                    .eq(ComActNeighborCircleTopicWestDO::getCommunityId, addCircleTopicAdminDTO.getCommunityId())
                    .ne(ComActNeighborCircleTopicWestDO::getId, circleTopicDO.getId()));
            if (oldCircleTopicDO != null && !oldCircleTopicDO.getId().equals(addCircleTopicAdminDTO.getId())) {
                return R.fail("该话题已存在");
            }
        }
        BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
        if (this.baseMapper.updateById(circleTopicDO) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    @Override
    public R getNeighborTopicByApp(Long communityId,Integer isZero,String name){
        return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name));
    }
    /**
     * 小程序-用户新增话题
     * @param circleTopicAppDTO 请求参数
     * @return  新增结果
     */
    @Override
    public R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO){
        ComActNeighborCircleTopicWestDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicWestDO>()
                .lambda().eq(ComActNeighborCircleTopicWestDO::getCommunityId,circleTopicAppDTO.getCommunityId())
                .eq(ComActNeighborCircleTopicWestDO::getName,circleTopicAppDTO.getName()));
        if(circleTopicDO == null){
            circleTopicDO = new ComActNeighborCircleTopicWestDO();
            circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId());
            circleTopicDO.setName(circleTopicAppDTO.getName());
            circleTopicDO.setCreateBy(circleTopicAppDTO.getUserId());
            circleTopicDO.setCreateAt(new Date());
            circleTopicDO.setCount(0);
            circleTopicDO.setHotNum(0L);
            circleTopicDO.setStatus(ComActNeighborCircleTopicWestDO.status.yes);
            this.baseMapper.insert(circleTopicDO);
        }
        return R.ok(circleTopicDO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java
New file
@@ -0,0 +1,929 @@
package com.panzhihua.service_community.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicWestService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseWestService;
import com.panzhihua.service_community.service.ComActNeighborCircleWestService;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
 * @create 2021-04-28 09:20:49
 * @describe 邻里圈表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleWestServiceImpl extends ServiceImpl<ComActNeighborCircleWestDAO, ComActNeighborCircleWestDO>
    implements ComActNeighborCircleWestService {
    @Resource
    ComActNeighborCircleFabulousWestDAO neighborCircleFabulousDAO;
    @Resource
    ComActNeighborCircleBrowseWestDAO neighborCircleBrowseDAO;
    @Resource
    ComActNeighborCircleCommentWestDAO neighborCircleCommentDAO;
    @Resource
    ComActNeighborCircleCommentReplyWestDAO neighborCircleCommentReplyDAO;
    @Resource
    private ComActNeighborCircleBrowseWestService comActNeighborCircleBrowseWestService;
    @Resource
    private ComActNeighborCircleCommentWestDAO comActNeighborCircleCommentWestDAO;
    @Resource
    private ComActNeighborCircleCommentReplyWestDAO comActNeighborCircleCommentReplyWestDAO;
    @Resource
    private ComActNeighborCircleFabulousWestDAO comActNeighborCircleFabulousWestDAO;
    @Resource
    private ComActNeighborCircleBrowseWestDAO comActNeighborCircleBrowseWestDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActNeighborCircleTopicWestMapper comActNeighborCircleTopicWestMapper;
    @Resource
    private ComActNeighborCircleTopicWestService comActNeighborCircleTopicWestService;
    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @Override
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        if (!doPager.getRecords().isEmpty()) {
            for (ComActNeighborCircleAppVO circleAppVO : doPager.getRecords()) {
                if (neighborCircleAppDTO.getUserId() != null) {
                    // 查询点赞信息
                    ComActNeighborCircleFabulousWestDO circleFabulousDO =
                        comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>()
                            .lambda().eq(ComActNeighborCircleFabulousWestDO::getParentId, circleAppVO.getId())
                            .eq(ComActNeighborCircleFabulousWestDO::getUserId, neighborCircleAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.llq)
                            .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                                ComActNeighborCircleFabulousWestDO.isEffective.yes));
                    if (circleFabulousDO != null) {
                        circleAppVO.setHaveSign(1);
                    } else {
                        circleAppVO.setHaveSign(2);
                    }
                }
                if (circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleWestDO.type.admin)) {
                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                    if (actDO != null) {
                        circleAppVO.setName(actDO.getName());
                    }
                }
            }
        }
        return R.ok(doPager);
    }
    /**
     * 用户发布邻里圈审核
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return 发布结果
     */
    @Override
    public R addNeighborByApp(AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
        // 新增邻里圈审核
        ComActNeighborCircleWestDO neighborCircleDO = new ComActNeighborCircleWestDO();
        BeanUtils.copyProperties(addNeighborCircleAppDTO, neighborCircleDO);
        if (addNeighborCircleAppDTO.getUserId() != null) {
            neighborCircleDO.setReleaseId(addNeighborCircleAppDTO.getUserId());
        }
        if (addNeighborCircleAppDTO.getCommunityId() != null) {
            neighborCircleDO.setCommunityId(addNeighborCircleAppDTO.getCommunityId());
        }
        if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
            neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
        }
        //判断用户的话题是否是新增的
        if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){
            //新增邻里圈话题
            ComActNeighborCircleTopicWestDO circleTopicDO = comActNeighborCircleTopicWestMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicWestDO>()
                    .lambda().eq(ComActNeighborCircleTopicWestDO::getCommunityId,neighborCircleDO.getCommunityId())
                    .eq(ComActNeighborCircleTopicWestDO::getName,addNeighborCircleAppDTO.getTopicName()));
            if(circleTopicDO == null){
                circleTopicDO = new ComActNeighborCircleTopicWestDO();
                circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId());
                circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName());
                circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId());
                circleTopicDO.setCreateAt(new Date());
                circleTopicDO.setCount(0);
                circleTopicDO.setHotNum(0L);
                circleTopicDO.setStatus(ComActNeighborCircleTopicWestDO.status.yes);
                comActNeighborCircleTopicWestMapper.insert(circleTopicDO);
            }
            neighborCircleDO.setTopicId(circleTopicDO.getId());
        }
        //判断当前邻里圈是否需要审核
        if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
            //当邻里圈不需要审核才进入自动审核
            //判断邻里圈自动审核结果
            if(addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
                neighborCircleDO.setStatus(ComActNeighborCircleWestDO.status.xs);
                if(neighborCircleDO.getTopicId() != null){
                    //给邻里圈话题添加邻里圈数量
                    comActNeighborCircleTopicWestMapper.addCount(neighborCircleDO.getTopicId());
                }
            }else{
                neighborCircleDO.setStatus(ComActNeighborCircleWestDO.status.bh);
                neighborCircleDO.setRefuseReason("内容违规");
            }
        }
        if(this.baseMapper.insert(neighborCircleDO) > 0){
            return R.ok();
        } else {
            return R.fail("发布失败");
        }
    }
    /**
     * 查看邻里圈详情
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈详情
     */
    @Override
    public R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        // 查询邻里圈详情
        ComActNeighborCircleDetailAppVO circleDetailAppVO =
            this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
        if (circleDetailAppVO == null) {
            return R.fail("未找到邻里圈信息");
        }
        if (circleDetailAppVO.getType() != null
            && circleDetailAppVO.getType().equals(ComActNeighborCircleWestDO.type.admin)) {
            ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
            if (actDO != null) {
                circleDetailAppVO.setName(actDO.getName());
            }
        }
        if (neighborCircleAppDTO.getUserId() != null) {
            // 查询邻里圈点赞信息
            ComActNeighborCircleFabulousWestDO circleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, circleDetailAppVO.getId())
                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, neighborCircleAppDTO.getUserId())
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.llq)
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (circleFabulousDO != null) {
                circleDetailAppVO.setHaveSign(1);
            } else {
                circleDetailAppVO.setHaveSign(2);
            }
        }
        // 查询邻里圈下评论列表
        IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage =
            comActNeighborCircleCommentWestDAO.pageNeighborCommentByApp(
                new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()), neighborCircleAppDTO);
        if (!circleCommentAppPage.getRecords().isEmpty()) {
            for (ComActNeighborCircleCommentAppVO circleCommentVo : circleCommentAppPage.getRecords()) {
                if (neighborCircleAppDTO.getUserId() != null) {
                    // 查询点赞信息
                    ComActNeighborCircleFabulousWestDO circleCommentFabulousDO =
                        comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>()
                            .lambda().eq(ComActNeighborCircleFabulousWestDO::getParentId, circleCommentVo.getId())
                            .eq(ComActNeighborCircleFabulousWestDO::getUserId, neighborCircleAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.pl)
                            .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                                ComActNeighborCircleFabulousWestDO.isEffective.yes));
                    if (circleCommentFabulousDO != null) {
                        circleCommentVo.setHaveSign(1);
                    } else {
                        circleCommentVo.setHaveSign(2);
                    }
                }
                // 查询评论下评论回复
                List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS =
                    comActNeighborCircleCommentReplyWestDAO.getCircleCommentReplyList(circleCommentVo.getId());
                if (!commentReplyAppVOS.isEmpty()) {
                    List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
                    if (neighborCircleAppDTO.getUserId() != null) {
                        int i = 0;
                        for (ComActNeighborCircleCommentReplyAppVO commentReplyVO : commentReplyAppVOS) {
                            if (i >= 2) {
                                break;
                            }
                            // 查询点赞信息
                            ComActNeighborCircleFabulousWestDO circleReplyFabulousDO = comActNeighborCircleFabulousWestDAO
                                .selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, commentReplyVO.getId())
                                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, neighborCircleAppDTO.getUserId())
                                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.hf)
                                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
                            if (circleReplyFabulousDO != null) {
                                commentReplyVO.setHaveSign(1);
                            } else {
                                commentReplyVO.setHaveSign(2);
                            }
                            newCommentReplyAppVOS.add(commentReplyVO);
                            i++;
                        }
                    }
                    circleCommentVo.setCircleCommentReplyAppList(newCommentReplyAppVOS);
                    circleCommentVo.setCommentReplyNum(commentReplyAppVOS.size());
                }
            }
        }
        circleDetailAppVO.setCircleCommentAppList(circleCommentAppPage.getRecords());
        return R.ok(circleDetailAppVO);
    }
    @Override
    public R pageNeighborByAdmin(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) {
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {
            if(data.getUserType()!=null){
                if (data.getUserType() != 1) {
                    data.setReleaseName(data.getCommunityName());
                }
            }
        });
        return R.ok(doPager);
    }
    @Override
    public R addNeighborByAdmin(AddNeighborCircleAdminVO addVO) {
        ComActNeighborCircleWestDO comActNeighborCircleWestDO = new ComActNeighborCircleWestDO();
        AdministratorsUserVO adminUser = this.baseMapper.selectUserByUserId(addVO.getUserId());
        if (adminUser == null) {
            return R.fail("请登录重试");
        }
        comActNeighborCircleWestDO.setReleaseId(addVO.getUserId());
        comActNeighborCircleWestDO.setReleasePhone(adminUser.getPhone());
        comActNeighborCircleWestDO.setCommunityId(adminUser.getCommunityId());
        comActNeighborCircleWestDO.setReleaseContent(addVO.getReleaseContent());
        comActNeighborCircleWestDO.setReleaseImages(addVO.getReleaseImages());
        comActNeighborCircleWestDO.setType(2);
        comActNeighborCircleWestDO.setStatus(2);
        comActNeighborCircleWestDO.setCommentNum(0);
        comActNeighborCircleWestDO.setFabulousNum(0);
        comActNeighborCircleWestDO.setForwardNum(0);
        comActNeighborCircleWestDO.setViewsNum(0);
        comActNeighborCircleWestDO.setIsBoutique(2);
        comActNeighborCircleWestDO.setCreateAt(new Date());
        comActNeighborCircleWestDO.setLastCommentNum(0);
        comActNeighborCircleWestDO.setLastFabulousNum(0);
        comActNeighborCircleWestDO.setLastViewsNum(0);
        this.baseMapper.insert(comActNeighborCircleWestDO);
        return R.ok();
    }
    @Override
    public R changeStatusByAdmin(EditNeighborCircleAdminVO editVO) {
        ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(editVO.getId());
        if (neighborCircleDO == null) {
            return R.fail("id有误!");
        }
        neighborCircleDO.setStatus(editVO.getStatus());
        if (editVO.getRefuseReason() != null) {
            neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
        }
        this.baseMapper.updateById(neighborCircleDO);
        if(editVO.getStatus().equals(EditNeighborCircleAdminVO.status.xs) && neighborCircleDO.getTopicId() != null){
            //给邻里圈话题添加邻里圈数量
            comActNeighborCircleTopicWestMapper.addCount(neighborCircleDO.getTopicId());
        }
        return R.ok(neighborCircleDO.getReleaseId());
    }
    /**
     * 用户查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @Override
    public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
            new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
            neighborCircleAppDTO.getUserId());
        if (!neighborCircleIPage.getRecords().isEmpty()) {
            for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
                // 查询点赞信息
                ComActNeighborCircleFabulousWestDO circleFabulousDO =
                    comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>()
                        .lambda().eq(ComActNeighborCircleFabulousWestDO::getParentId, circleAppVO.getId())
                        .eq(ComActNeighborCircleFabulousWestDO::getUserId, neighborCircleAppDTO.getUserId())
                        .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.llq)
                        .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                            ComActNeighborCircleFabulousWestDO.isEffective.yes));
                if (circleFabulousDO != null) {
                    circleAppVO.setHaveSign(1);
                } else {
                    circleAppVO.setHaveSign(2);
                }
            }
        }
        return R.ok(neighborCircleIPage);
    }
    /**
     * 邻里圈点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 点赞结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R neighborFabulousByApp(ComActNeighborFabulousAppDTO fabulousAppDTO) {
        ComActNeighborCircleFabulousWestDO circleFabulousDO = new ComActNeighborCircleFabulousWestDO();
        circleFabulousDO.setUserId(fabulousAppDTO.getUserId());
        circleFabulousDO.setType(fabulousAppDTO.getType());
        circleFabulousDO.setParentId(fabulousAppDTO.getServiceId());
        // 判断点赞类型
        if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)) {
            ComActNeighborCircleFabulousWestDO oldCircleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborFabulousAppDTO.type.llq)
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective, ComActNeighborCircleFabulousWestDO.isEffective.yes)
                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, fabulousAppDTO.getUserId()));
            if (oldCircleFabulousDO != null) {
                return R.fail("您已点赞");
            }
            // 增加邻里圈点赞数量
            ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(fabulousAppDTO.getServiceId());
            if (neighborCircleDO != null) {
                neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() + 1);
                neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                neighborCircleDO.setHotNum(neighborCircleDO.getHotNum() + hotNum);
                this.baseMapper.updateById(neighborCircleDO);
                comActNeighborCircleTopicWestMapper.addHotNum(neighborCircleDO.getTopicId(),hotNum);
                circleFabulousDO.setCircleId(neighborCircleDO.getId());
            }
            // 添加邻里圈浏览记录
            comActNeighborCircleBrowseWestService.addBrowseRecord(fabulousAppDTO.getServiceId(),
                fabulousAppDTO.getUserId());
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)) {
            ComActNeighborCircleFabulousWestDO oldCircleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborFabulousAppDTO.type.pl)
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (oldCircleFabulousDO != null) {
                return R.fail("您已点赞");
            }
            // 增加邻里圈评论点赞数量
            ComActNeighborCircleCommentWestDO circleCommentDO =
                comActNeighborCircleCommentWestDAO.selectById(fabulousAppDTO.getServiceId());
            if (circleCommentDO != null) {
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
                comActNeighborCircleCommentWestDAO.updateById(circleCommentDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),hotNum);
                this.baseMapper.addHotNum(circleCommentDO.getCircleId(),hotNum);
                circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
            ComActNeighborCircleFabulousWestDO oldCircleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborFabulousAppDTO.type.hf)
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (oldCircleFabulousDO != null) {
                return R.fail("您已点赞");
            }
            // 增加邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyWestDO circleCommentReplyDO =
                comActNeighborCircleCommentReplyWestDAO.selectById(fabulousAppDTO.getServiceId());
            if (circleCommentReplyDO != null) {
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
                comActNeighborCircleCommentReplyWestDAO.updateById(circleCommentReplyDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),hotNum);
                this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),hotNum);
                circleFabulousDO.setCircleId(circleCommentReplyDO.getCircleId());
            }
        }
        if (comActNeighborCircleFabulousWestDAO.insert(circleFabulousDO) > 0) {
            return R.ok();
        } else {
            return R.fail("点赞失败");
        }
    }
    /**
     * 邻里圈转发
     *
     * @param forwardAppDTO
     *            请求参数
     * @return 转发结果
     */
    @Override
    public R neighborForwardByApp(ComActNeighborForwardAppDTO forwardAppDTO) {
        if (forwardAppDTO.getUserId() != null) {
            // 添加邻里圈浏览记录
            comActNeighborCircleBrowseWestService.addBrowseRecord(forwardAppDTO.getCircleId(), forwardAppDTO.getUserId());
        }
        ComActNeighborCircleWestDO circleDO = this.baseMapper.selectById(forwardAppDTO.getCircleId());
        if (circleDO == null) {
            return R.fail("没有找到邻里圈");
        }
        circleDO.setForwardNum(circleDO.getForwardNum() + 1);
        if (this.baseMapper.updateById(circleDO) > 0){
            //计算需要增加的热度值
            Long hotNum = NeighborCircleConstants.VIEW_HOT_NUM;
            this.baseMapper.addHotNum(forwardAppDTO.getCircleId(),hotNum);
            this.baseMapper.addTopicHotNum(forwardAppDTO.getCircleId(),hotNum);
            return R.ok();
        } else {
            return R.fail("转发失败");
        }
    }
    /**
     * 邻里圈评论
     *
     * @param commentAppDTO
     *            请求参数
     * @return 评论结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R neighborCommentByApp(ComActNeighborCommentAppDTO commentAppDTO) {
        ComActNeighborCircleCommentWestDO circleCommentDO = new ComActNeighborCircleCommentWestDO();
        // 查询邻里圈更新邻里圈评论数量
        ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(commentAppDTO.getCircleId());
        if (neighborCircleDO == null) {
            return R.fail("没有找到邻里圈");
        }
        neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
        neighborCircleDO.setReplyAt(new Date());
        this.baseMapper.updateById(neighborCircleDO);
        //计算需要增加的热度值
        Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
        this.baseMapper.addHotNum(commentAppDTO.getCircleId(),hotNum);
        this.baseMapper.addTopicHotNum(commentAppDTO.getCircleId(),hotNum);
        circleCommentDO.setCircleId(commentAppDTO.getCircleId());
        circleCommentDO.setUserId(commentAppDTO.getUserId());
        circleCommentDO.setUserPhone(commentAppDTO.getPhone());
        circleCommentDO.setContent(commentAppDTO.getContent());
        if (neighborCircleDO.getReleaseId().equals(commentAppDTO.getUserId())) {
            circleCommentDO.setIsRelease(ComActNeighborCircleCommentWestDO.isRelease.yes);
        }
        if (comActNeighborCircleCommentWestDAO.insert(circleCommentDO) > 0) {
            return R.ok();
        } else {
            return R.fail("评论失败");
        }
    }
    /**
     * 邻里圈回复
     *
     * @param replyAppDTO
     *            请求参数
     * @return 回复结果
     */
    @Override
    public R neighborReplyByApp(ComActNeighborReplyAppDTO replyAppDTO) {
        ComActNeighborCircleCommentReplyWestDO circleCommentReplyDO = new ComActNeighborCircleCommentReplyWestDO();
        // 查询邻里圈更新邻里圈评论数量
        ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(replyAppDTO.getCircleId());
        if (neighborCircleDO == null) {
            return R.fail("没有找到邻里圈");
        }
        neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
        neighborCircleDO.setReplyAt(new Date());
        this.baseMapper.updateById(neighborCircleDO);
        //计算需要增加的热度值
        Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
        this.baseMapper.addHotNum(replyAppDTO.getCircleId(),hotNum);
        this.baseMapper.addTopicHotNum(replyAppDTO.getCircleId(),hotNum);
        circleCommentReplyDO.setCircleId(replyAppDTO.getCircleId());
        circleCommentReplyDO.setUserId(replyAppDTO.getUserId());
        circleCommentReplyDO.setReplyContent(replyAppDTO.getContent());
        if (neighborCircleDO.getReleaseId().equals(replyAppDTO.getUserId())) {
            circleCommentReplyDO.setIsRelease(1);
        }
        // 判断回复类型
        if (replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.pl)) {
            // 查询评论信息
            ComActNeighborCircleCommentWestDO circleCommentDO =
                comActNeighborCircleCommentWestDAO.selectById(replyAppDTO.getServiceId());
            if (circleCommentDO != null) {
                circleCommentReplyDO.setCommentId(replyAppDTO.getServiceId());
                circleCommentReplyDO.setParentId(0L);
                circleCommentReplyDO.setParentUserId(circleCommentDO.getUserId());
            }
        } else if (replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.hf)) {
            // 查询上级回复信息
            ComActNeighborCircleCommentReplyWestDO parentCommentReplyDO =
                comActNeighborCircleCommentReplyWestDAO.selectById(replyAppDTO.getServiceId());
            if (parentCommentReplyDO != null) {
                circleCommentReplyDO.setCommentId(parentCommentReplyDO.getCommentId());
                circleCommentReplyDO.setParentId(parentCommentReplyDO.getId());
                circleCommentReplyDO.setParentUserId(parentCommentReplyDO.getUserId());
            }
        }
        if (comActNeighborCircleCommentReplyWestDAO.insert(circleCommentReplyDO) > 0) {
            return R.ok();
        } else {
            return R.fail("回复失败");
        }
    }
    @Override
    public R timeTaskCircleFlow() {
        Date oldDate = DateUtils.addDay(new Date(), -3);
        // 查询所有状态正常的邻里圈
        List<ComActNeighborCircleWestDO> circleDOList =
            this.baseMapper.selectList(new QueryWrapper<ComActNeighborCircleWestDO>().lambda()
                .eq(ComActNeighborCircleWestDO::getStatus, ComActNeighborCircleWestDO.status.xs));
        if (!circleDOList.isEmpty()) {
            // 遍历查询到的邻里圈,更新邻里圈内近3天的评论数,点赞数,浏览量
            for (ComActNeighborCircleWestDO neighborCircleDO : circleDOList) {
                // 查询邻里圈近3天的评论数
                int commentCount =
                    comActNeighborCircleCommentWestDAO.selectCount(new QueryWrapper<ComActNeighborCircleCommentWestDO>()
                        .lambda().eq(ComActNeighborCircleCommentWestDO::getCircleId, neighborCircleDO.getId()));
                // 查询邻里圈近3天的评论回复数
                int commentReplyCount = comActNeighborCircleCommentReplyWestDAO
                    .selectCount(new QueryWrapper<ComActNeighborCircleCommentReplyWestDO>().lambda()
                        .eq(ComActNeighborCircleCommentReplyWestDO::getCircleId, neighborCircleDO.getId()));
                // 查询邻里圈近3天的点赞数
                int fabulousCount =
                    comActNeighborCircleFabulousWestDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousWestDO>()
                        .lambda().eq(ComActNeighborCircleFabulousWestDO::getCircleId, neighborCircleDO.getId())
                        .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                            ComActNeighborCircleFabulousWestDO.isEffective.yes));
                // 查询邻里圈近3天的浏览量
                int browseCount =
                    comActNeighborCircleBrowseWestDAO.selectCount(new QueryWrapper<ComActNeighborCircleBrowseWestDO>().lambda()
                        .eq(ComActNeighborCircleBrowseWestDO::getNeighborId, neighborCircleDO.getId()));
                // 更新邻里圈信息
                neighborCircleDO.setLastCommentNum(commentCount + commentReplyCount);
                neighborCircleDO.setLastFabulousNum(fabulousCount);
                neighborCircleDO.setLastViewsNum(browseCount);
                this.baseMapper.updateById(neighborCircleDO);
            }
        }
        return R.ok();
    }
    @Override
    public R deleteByAdmin(Long id) {
        ComActNeighborCircleWestDO comActNeighborCircleWestDO = this.baseMapper.selectById(id);
        if (comActNeighborCircleWestDO == null) {
            return R.fail();
        }
        if (comActNeighborCircleWestDO.getStatus() == 1) {
            return R.fail("待审核的邻里圈不能删除");
        }
        // 邻里圈删除
        this.baseMapper.deleteById(id);
        // 邻里圈评论删除
        neighborCircleCommentDAO.delete(
            new LambdaQueryWrapper<ComActNeighborCircleCommentWestDO>().eq(ComActNeighborCircleCommentWestDO::getCircleId, id));
        // 邻里圈回复删除
        neighborCircleCommentReplyDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleCommentReplyWestDO>()
            .eq(ComActNeighborCircleCommentReplyWestDO::getCircleId, id));
        // 邻里圈浏览器记录
        neighborCircleBrowseDAO.delete(
            new LambdaQueryWrapper<ComActNeighborCircleBrowseWestDO>().eq(ComActNeighborCircleBrowseWestDO::getNeighborId, id));
        // 邻里圈点赞删除
        neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousWestDO>()
            .eq(ComActNeighborCircleFabulousWestDO::getCircleId, id));
        return R.ok();
    }
    @Override
    public R detailNeighborByAdmin(Long id) {
        ComActNeighborCircleWestDO comActNeighborCircleWestDO = this.baseMapper.selectById(id);
        if (comActNeighborCircleWestDO == null) {
            return R.fail("id有误");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleWestDO.getReleaseId());
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleWestDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());
        // 查询话题名称
        if (comActNeighborCircleWestDO.getTopicId() != null) {
            ComActNeighborCircleTopicWestDO circleTopicDO =
                comActNeighborCircleTopicWestMapper.selectById(comActNeighborCircleWestDO.getTopicId());
            vo.setTopicName(circleTopicDO.getName());
        }
        return R.ok(vo);
    }
    @Override
    public R detailNeighborAllCommentByAdmin(DetailNeighborAllCommentByAdminDTO dto) {
        ComActNeighborCircleWestDO comActNeighborCircleWestDO = this.baseMapper.selectById(dto.getId());
        if (comActNeighborCircleWestDO == null) {
            return R.fail("id有误");
        }
        Page<ComActNeighborCircleCommentWestDO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
        // 1、先查询所有该邻里圈_的评论
        IPage<ComActNeighborCommentByAdminVO> commentDOIPage =
            neighborCircleCommentDAO.selectPageDetailNeighborComment(page, dto);
        return R.ok(commentDOIPage);
    }
    @Override
    public R changeCommentStatusByAdmin(ChangeCommentStatusByAdminVO dto) {
        ComActNeighborCircleCommentWestDO commentDO = neighborCircleCommentDAO.selectById(dto.getId());
        if (commentDO == null) {
            return R.fail("id有误!");
        }
        commentDO.setStatus(dto.getStatus());
        neighborCircleCommentDAO.updateById(commentDO);
        // 查询邻里圈更新邻里圈评论数量
        ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(commentDO.getCircleId());
        if (neighborCircleDO != null) {
            if (dto.getStatus().equals(2)) {
                neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() - 1);
            } else {
                neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
            }
            this.baseMapper.updateById(neighborCircleDO);
        }
        return R.ok();
    }
    @Override
    public R detailNeighborCommentByAdmin(Long id) {
        ComActNeighborCircleCommentWestDO commentDO = neighborCircleCommentDAO.selectById(id);
        if (commentDO == null) {
            return R.fail("id有误!");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
        ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
        BeanUtils.copyProperties(commentDO, vo);
        String name = user.getName() == null ? user.getNickName() : user.getName();
        vo.setUserName(name);
        vo.setUserPhone(user.getPhone());
        return R.ok(vo);
    }
    @Override
    public R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto) {
        Page<ComActNeighborCircleCommentReplyWestDO> page = new Page<>(dto.getPageNum(), dto.getPageSize());
        Page<ComActNeighborCommentReplyByAdminVO> replyPage =
            neighborCircleCommentReplyDAO.selectListByComment(page, dto);
        replyPage.getRecords().forEach(reply -> {
        });
        return R.ok(replyPage);
    }
    @Override
    public R detailNeighborCommentReply(Long id) {
        ComActNeighborCircleCommentReplyWestDO replyDO = neighborCircleCommentReplyDAO.selectById(id);
        if (replyDO == null) {
            return R.fail("id有误!");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(replyDO.getUserId());
        ComActNeighborCommentReplyByAdminVO vo = new ComActNeighborCommentReplyByAdminVO();
        BeanUtils.copyProperties(replyDO, vo);
        vo.setUserName(user.getName());
        vo.setUserPhone(user.getPhone());
        return R.ok(vo);
    }
    @Override
    public R changeCommentReplyStatusByAdmin(ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
        ComActNeighborCircleCommentReplyWestDO replyDO =
            neighborCircleCommentReplyDAO.selectById(changeStatusReplyVO.getId());
        if (replyDO == null) {
            return R.fail("id有误!");
        }
        replyDO.setStatus(changeStatusReplyVO.getStatus());
        neighborCircleCommentReplyDAO.updateById(replyDO);
        return R.ok();
    }
    /**
     * 邻里圈取消点赞
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 取消点赞结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO) {
        ComActNeighborCircleFabulousWestDO circleFabulousDO = null;
        // 查询邻里圈点赞信息
        if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)) {
            // 查询点赞信息
            circleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, fabulousAppDTO.getUserId())
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.llq)
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (circleFabulousDO == null) {
                return R.fail("未查询到点赞信息");
            }
            // 减少邻里圈点赞数量
            ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(fabulousAppDTO.getServiceId());
            if (neighborCircleDO != null) {
                neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() - 1);
                this.baseMapper.updateById(neighborCircleDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(neighborCircleDO.getId(),-hotNum);
                this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),-hotNum);
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)) {
            circleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, fabulousAppDTO.getUserId())
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.pl)
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (circleFabulousDO == null) {
                return R.fail("未查询到点赞信息");
            }
            // 减少邻里圈评论点赞数量
            ComActNeighborCircleCommentWestDO circleCommentDO =
                comActNeighborCircleCommentWestDAO.selectById(fabulousAppDTO.getServiceId());
            if (circleCommentDO != null) {
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() - 1);
                comActNeighborCircleCommentWestDAO.updateById(circleCommentDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(circleCommentDO.getCircleId(),-hotNum);
                this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),-hotNum);
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
            circleFabulousDO =
                comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>().lambda()
                    .eq(ComActNeighborCircleFabulousWestDO::getParentId, fabulousAppDTO.getServiceId())
                    .eq(ComActNeighborCircleFabulousWestDO::getUserId, fabulousAppDTO.getUserId())
                    .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.hf)
                    .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                        ComActNeighborCircleFabulousWestDO.isEffective.yes));
            if (circleFabulousDO == null) {
                return R.fail("未查询到点赞信息");
            }
            // 减少邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyWestDO circleCommentReplyDO =
                comActNeighborCircleCommentReplyWestDAO.selectById(fabulousAppDTO.getServiceId());
            if (circleCommentReplyDO != null) {
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() - 1);
                comActNeighborCircleCommentReplyWestDAO.updateById(circleCommentReplyDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
                this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
            }
        }
        if (circleFabulousDO != null) {
            circleFabulousDO.setIsEffective(ComActNeighborCircleFabulousWestDO.isEffective.no);
            comActNeighborCircleFabulousWestDAO.updateById(circleFabulousDO);
        }
        return R.ok();
    }
    /**
     * 添加邻里圈浏览记录
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return 返回参数
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
        // 添加邻里圈浏览记录
        comActNeighborCircleBrowseWestService.addBrowseRecord(addBrowseAppDTO.getCircleId(), addBrowseAppDTO.getUserId());
        // 更新邻里圈记录
        ComActNeighborCircleWestDO neighborCircleDO = this.baseMapper.selectById(addBrowseAppDTO.getCircleId());
        if (neighborCircleDO != null) {
            neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
            this.baseMapper.updateById(neighborCircleDO);
            //计算需要增加的热度值
            Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
            this.baseMapper.addHotNum(neighborCircleDO.getId(),hotNum);
            this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),hotNum);
        }
        return R.ok();
    }
    /**
     * 分页查询评论下所有回复
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return 回复列表
     */
    @Override
    public R neighborCommentReplyByApp(ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
        IPage<ComActNeighborCommentReplyAppVO> neighborCircleIPage = this.baseMapper.neighborCommentReplyByApp(
            new Page<>(commentReplyAppDTO.getPageNum(), commentReplyAppDTO.getPageSize()),
            commentReplyAppDTO.getCommentId());
        if (!neighborCircleIPage.getRecords().isEmpty()) {
            for (ComActNeighborCommentReplyAppVO commentReplyAppVO : neighborCircleIPage.getRecords()) {
                if (commentReplyAppDTO.getUserId() != null) {
                    // 查询点赞信息
                    ComActNeighborCircleFabulousWestDO circleFabulousDO =
                        comActNeighborCircleFabulousWestDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousWestDO>()
                            .lambda().eq(ComActNeighborCircleFabulousWestDO::getParentId, commentReplyAppVO.getId())
                            .eq(ComActNeighborCircleFabulousWestDO::getUserId, commentReplyAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousWestDO::getType, ComActNeighborCircleFabulousWestDO.type.hf)
                            .eq(ComActNeighborCircleFabulousWestDO::getIsEffective,
                                ComActNeighborCircleFabulousWestDO.isEffective.yes));
                    if (circleFabulousDO != null) {
                        commentReplyAppVO.setHaveSign(1);
                    } else {
                        commentReplyAppVO.setHaveSign(2);
                    }
                }
            }
        }
        return R.ok(neighborCircleIPage);
    }
    /**
     * 小程序-删除邻里圈
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    @Override
    public R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO){
        ComActNeighborCircleWestDO neighborCircleDO = new ComActNeighborCircleWestDO();
        neighborCircleDO.setId(circleTopicAppDTO.getId());
        neighborCircleDO.setIsDel(ComActNeighborCircleWestDO.isDel.yes);
        if(this.baseMapper.updateById(neighborCircleDO) > 0){
            return R.ok();
        }
        return R.fail();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
@@ -59,7 +59,7 @@
        comActRaffle.setStatus(0);
        int count= this.baseMapper.insert(comActRaffle);
        if(count>0){
            rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffle, message -> {
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffle, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStartTime()));
                return message;
            });
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -1,9 +1,7 @@
package com.panzhihua.service_community.service.impl;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -240,9 +238,9 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityAllList(String areaCode) {
    public R getCommunityAllList(String appId) {
        // 查询街道列表
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(areaCode);
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(appId);
        streetList.forEach(street -> {
            // 查询街道下社区列表
            List<CommunitySwitchAllAppletsVO> communityList =
@@ -265,8 +263,8 @@
     * @return 社区列表
     */
    @Override
    public R communitySwitchSearchList(String name,String areaCode) {
        return R.ok(this.comActDAO.getCommunityListByName(name,areaCode));
    public R communitySwitchSearchList(String name,String appId) {
        return R.ok(this.comActDAO.getCommunityListByName(name,appId));
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +10,10 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.service.ComActSocialMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -18,6 +21,8 @@
import javax.annotation.Resource;
import java.util.Date;
import static java.util.Objects.nonNull;
/**
 * 社会组织成员表(ComActSocialMember)表服务实现类
@@ -32,8 +37,18 @@
    private ComActSocialMemberDao comActSocialMemberDao;
    @Resource
    private UserService userService;
    @Resource
    private ComActSocialOrgDao comActSocialOrgDao;
    @Override
    public R pageList(CommonPage commonPage) {
        Integer userType = commonPage.getUserType();
        if (nonNull(userType) && userType.equals(3)) {
            ComActSocialOrg comActSocialOrg = comActSocialOrgDao.selectOne(new LambdaQueryWrapper<ComActSocialOrg>()
                    .eq(ComActSocialOrg::getUserId, commonPage.getUserId()));
            if (nonNull(comActSocialOrg)) {
                commonPage.setParamId(comActSocialOrg.getId());
            }
        }
        return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }
@@ -55,6 +70,7 @@
        if(comActSocialMemberVO.getStreetId()!=null){
            administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId());
        }
        administratorsUserVO.setCommunityId(comActSocialMemberVO.getCommunityId());
        administratorsUserVO.setName(comActSocialMemberVO.getName());
        administratorsUserVO.setPhone(comActSocialMemberVO.getPhone());
        R r=userService.addUserBackstageProperty(administratorsUserVO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditScheduleServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditScheduleService;
import org.springframework.stereotype.Service;
/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 15:10:48
 */
@Service("comActSocialOrgHatchAuditScheduleService")
public class ComActSocialOrgHatchAuditScheduleServiceImpl
    extends ServiceImpl<ComActSocialOrgHatchAuditScheduleDAO, ComActSocialOrgHatchAuditSchedule>
    implements ComActSocialOrgHatchAuditScheduleService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditServiceImpl.java
New file
@@ -0,0 +1,231 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditScheduleVO;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.dao.SysConfMapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditService;
/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Service("comActSocialOrgHatchAuditService")
public class ComActSocialOrgHatchAuditServiceImpl extends ServiceImpl<ComActSocialOrgHatchAuditDAO, ComActSocialOrgHatchAudit> implements ComActSocialOrgHatchAuditService {
    private static final String SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY = "SOCIAL_ORG_PROCESS";
    private static final String SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME = "社会组织孵化流程";
    @Resource
    private ComActSocialOrgHatchDAO comActSocialOrgHatchDAO;
    @Resource
    private ComActSocialOrgHatchAuditScheduleDAO comActSocialOrgHatchAuditScheduleDAO;
    @Resource
    private SysConfMapper sysConfMapper;
    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @Override
    public R pageHatchAudit(PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        Page page = new Page<>();
        page.setSize(pageHatchAuditDTO.getPageSize());
        page.setCurrent(pageHatchAuditDTO.getPageNum());
        return R.ok(this.baseMapper.pageHatchAudit(page, pageHatchAuditDTO));
    }
    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @Override
    public R detailHatchAudit(Long id) {
        return R.ok(this.baseMapper.detailHatchAudit(id));
    }
    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO) {
        ComActSocialOrgHatchAudit hatchAudit = this.baseMapper.selectById(hatchAuditDTO.getId());
        if (isNull(hatchAudit)) {
            return R.fail("资源不存在");
        }
        Integer preStatus = hatchAudit.getStatus();
        Integer status = hatchAuditDTO.getStatus();
        BeanUtils.copyProperties(hatchAuditDTO, hatchAudit);
        int result = this.baseMapper.updateById(hatchAudit);
        if (nonNull(status) && !preStatus.equals(status) && status.equals(1)) {
            //重新提交
            if (result > 0) {
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.cxtj);
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        } else if (nonNull(status) && !preStatus.equals(status) && status.equals(2)) {
            //审核通过
            if (result > 0) {
                //创建孵化数据
                ComActSocialOrgHatchAudit newHatchAudit = this.baseMapper.selectById(hatchAuditDTO.getId());
                ComActSocialOrgHatch socialOrgHatch = new ComActSocialOrgHatch();
                BeanUtils.copyProperties(newHatchAudit, socialOrgHatch);
                socialOrgHatch.setCreatedAt(null);
                socialOrgHatch.setId(null);
                socialOrgHatch.setStatus(1);
                socialOrgHatch.setUpdatedAt(null);
                socialOrgHatch.setAuditId(hatchAudit.getId());
                comActSocialOrgHatchDAO.insert(socialOrgHatch);
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.shtg);
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        } else if (nonNull(status) && !preStatus.equals(status) && status.equals(3)) {
            //驳回申请
            if (result > 0) {
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.ybh);
                hatchAuditSchedule.setDetail(hatchAuditDTO.getRefuseReason());
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        }
        return result > 0 ? R.ok() : R.fail("操作失败,请重新尝试");
    }
    /**
     * 获取孵化流程配置
     * @return
     */
    @Override
    public R getHatchAuditProcess() {
        return R.ok(sysConfMapper.getSysConfValue(SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY, null));
    }
    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @Override
    public R putHatchAuditProcess(HatchAuditProcessDTO processDTO) {
        SysConfDO sysConfDO = sysConfMapper.selectOne(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCode, SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY));
        int result = 0;
        if (isNull(sysConfDO)) {
            sysConfDO=new SysConfDO();
            //创建
            sysConfDO.setName(SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME);
            sysConfDO.setCode(SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY);
            sysConfDO.setDescription(SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME);
            sysConfDO.setCreateAt(new Date());
            result = sysConfMapper.insert(sysConfDO);
        } else {
            sysConfDO.setValue(processDTO.getProcess());
            result = sysConfMapper.update(sysConfDO, new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCode, SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY));
        }
        return result > 0 ? R.ok() : R.fail("操作失败,请重新尝试");
    }
    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @Override
    public R addHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO) {
        SocialOrgHatchAuditVO orgHatchAuditVO = this.baseMapper.getHatchAuditSchedule(hatchAuditDTO.getUserId());
        if (nonNull(orgHatchAuditVO)) {
            return R.fail("请勿重复申请");
        }
        ComActSocialOrgHatchAudit orgHatchAudit = new ComActSocialOrgHatchAudit();
        BeanUtils.copyProperties(hatchAuditDTO, orgHatchAudit);
        orgHatchAudit.setStatus(1);
        int result = this.baseMapper.insert(orgHatchAudit);
        if (result > 0) {
            //创建申请进度记录
            ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
            hatchAuditSchedule.setAuditId(orgHatchAudit.getId());
            hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.tjzl);
            comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            return R.ok();
        }
        return R.fail("操作失败,请重新尝试");
    }
    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @Override
    public R getHatchAuditSchedule(Long userId) {
        SocialOrgHatchAuditVO orgHatchAuditVO = this.baseMapper.getHatchAuditSchedule(userId);
        if (nonNull(orgHatchAuditVO)) {
            List<ComActSocialOrgHatchAuditSchedule> schedules = comActSocialOrgHatchAuditScheduleDAO.selectList(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                    .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, orgHatchAuditVO.getId()).orderByAsc(ComActSocialOrgHatchAuditSchedule::getCreatedAt));
            if (!schedules.isEmpty()) {
                List<SocialOrgHatchAuditScheduleVO> scheduleVOList = new ArrayList<>();
                schedules.stream().forEach(e -> {
                    SocialOrgHatchAuditScheduleVO scheduleVO = new SocialOrgHatchAuditScheduleVO();
                    BeanUtils.copyProperties(e, scheduleVO);
                    scheduleVOList.add(scheduleVO);
                });
                orgHatchAuditVO.setScheduleVOList(scheduleVOList);
            }
        }
        return R.ok(orgHatchAuditVO);
    }
    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @Override
    public R deleteHatchAudit(Long id) {
        this.baseMapper.deleteById(id);
        comActSocialOrgHatchAuditScheduleDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, id));
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchServiceImpl.java
New file
@@ -0,0 +1,95 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.service.ComActSocialOrgHatchService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import static java.util.Objects.nonNull;
/**
 * 社会组织孵化表(ComActSocialOrgHatch)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Service("comActSocialOrgHatchService")
public class ComActSocialOrgHatchServiceImpl extends ServiceImpl<ComActSocialOrgHatchDAO, ComActSocialOrgHatch> implements ComActSocialOrgHatchService {
    @Resource
    private ComActSocialOrgHatchAuditDAO comActSocialOrgHatchAuditDAO;
    @Resource
    private ComActSocialOrgHatchAuditScheduleDAO comActSocialOrgHatchAuditScheduleDAO;
    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @Override
    public R pageOrgHatch(PageSocialOrgHatchDTO pageHatchDTO) {
        Page page = new Page<>();
        page.setSize(pageHatchDTO.getPageSize());
        page.setCurrent(pageHatchDTO.getPageNum());
        return R.ok(this.baseMapper.pageOrgHatch(page, pageHatchDTO));
    }
    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @Override
    public R detailOrgHatch(Long id) {
        return R.ok(this.baseMapper.detailOrgHatch(id));
    }
    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @Override
    public R updateOrgHatchStatus(Long id, Integer status) {
        ComActSocialOrgHatch socialOrgHatch = new ComActSocialOrgHatch();
        socialOrgHatch.setStatus(status);
        int result = this.baseMapper.update(socialOrgHatch, new LambdaQueryWrapper<ComActSocialOrgHatch>().eq(ComActSocialOrgHatch::getId, id));
        return result > 0 ? R.ok() : R.fail("操作失败,请重新尝试");
    }
    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @Override
    public R deleteOrgHatch(Long id) {
        ComActSocialOrgHatch orgHatch = this.baseMapper.selectById(id);
        Long auditId = orgHatch.getAuditId();
        if (nonNull(orgHatch)) {
            int result = this.baseMapper.deleteById(id);
            if (result > 0) {
                comActSocialOrgHatchAuditDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAudit>()
                        .eq(ComActSocialOrgHatchAudit::getId, auditId));
                comActSocialOrgHatchAuditScheduleDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                        .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, auditId));
            }
        }
        return R.ok();
    }
}
Diff truncated after the above file
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerOrgTeamServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerServiceTypeServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussOptionUserDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseTypeMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicWestDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleWestDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditScheduleMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectSignMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerOrgTeamDao.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerServiceTypeDao.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerSkillDao.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComStreetMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeRelationDO.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventSpecialCrowdRecordDO.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeDO.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeMemberDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngWestApi.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberWestDAO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynUserDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberWestDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberWestService.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarmSetting.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyHelp.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysAppConfigApi.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysAppConfig.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysTemplateConfig.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngStructHouseDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/EventGridMemberBuildingRelationDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserAgreementDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserInputDO.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml springcloud_k8s_panzhihuazhihuishequ/shop_backstage/pom.xml springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/KaphtchaApi.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/AuthConfig.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/KaptchaConfig.java springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/MyAESUtil.java springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java