101captain
2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d
Merge branch 'master' into hemenkou_dev

# Conflicts:
# springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
# springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
# springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
# springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
# springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
# springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
# springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
# 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/model/dos/ComPbDynDO.java
205个文件已修改
177个文件已添加
20053 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/common.iml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java 172 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenGridStaticsReturn.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java 252 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java 37 ●●●●● 补丁 | 查看 | 原始文档 | 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/reserve/HomeQuarantineRegisterExportVO.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | 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 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 731 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java 220 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java 264 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java 222 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java 554 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHourseOrderApi.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHoursePreOrderApi.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHousesApi.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/CustemSecondhandler.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/Custemhandler.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/BaseUtils.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/pom.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAnnouncementApi.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActPictureLibraryApi.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyPublicityApi.java 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseFileApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseLabelApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseOrderApi.java 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePayingOrderApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePreOrderApi.java 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRefundOrderApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRegisterApi.java 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseReturnOrderApi.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHousesContractConfigApi.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActEvaluateDAO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityCodeDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAnnouncementDao.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralUserMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActPictureLibraryDAO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveMapper.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveRecordMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseDonatesDao.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthRecordsDAO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyPublicityDAO.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseContractConfigDao.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseFileDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseLabelDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseOrderDao.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePayingOrderDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePreOrderDao.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRefundOrderDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRegisterDao.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseReturnOrderDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityCode.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseContractConfig.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseFile.java 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseLabel.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseOrder.java 287 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePayingOrder.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePreOrder.java 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRefundOrder.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRegister.java 355 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseReturnOrder.java 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActEvaluateService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityCodeService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAnnouncementService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActPictureLibraryService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthRecordService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyPublicityService.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseContractConfigService.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseFileService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseLabelService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseOrderService.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePayingOrderService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePreOrderService.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRefundOrderService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseReturnOrderService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java 665 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityCodeServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java 447 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAnnouncementServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java 146 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActPictureLibraryServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java 287 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java 313 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyPublicityServiceImpl.java 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseContractConfigServiceImpl.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseFileServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseLabelServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePayingOrderServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePreOrderServiceImpl.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRefundOrderServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java 459 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseReturnOrderServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/NearbyUtil.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ResultEntity.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaConfiguration.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaProperties.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxRequestEntity.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityCodeMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml 200 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActPictureLibrary.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseDonatesMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml 498 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVillageDOMapper.xml 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseContractConfigMapper.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseFileMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseLabelMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseOrderMapper.xml 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePayingOrderMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePreOrderMapper.xml 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRefundOrderMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRegisterMapper.xml 196 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseReturnOrderMapper.xml 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 212 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java
New file
@@ -0,0 +1,57 @@
package com.panzhihua.applets.api;
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.R;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Date;
/**
 * 签到二维码表(ComActActivityCode)表控制层
 *
 * @author makejava
 * @since 2021-10-15 15:23:10
 */
@Slf4j
@Api(tags = {"活动二维码"})
@RestController
@RequestMapping("comActActivityCode")
public class ComActActivityCodeApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 查看二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("查看二维码")
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.getQRCode(qrCodeVO);
    }
    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("重置二维码")
    @PostMapping("/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.resetQRCode(qrCodeVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java
New file
@@ -0,0 +1,96 @@
package com.panzhihua.applets.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.ComActAnnouncementVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
/**
 * (ComActAnnouncement)表控制层
 *
 * @author makejava
 * @since 2021-11-01 13:45:55
 */
@Slf4j
@Api(tags = {"通知公告"})
@RestController
@RequestMapping("comActAnnouncement")
public class ComActAnnouncementApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActAnnouncementVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.comActAnnouncementSelectAll(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActAnnouncementSelectOne(id);
    }
    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        comActAnnouncementVO.setCreateTime(new Date());
        comActAnnouncementVO.setCommunityId(this.getCommunityId());
       return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
    }
    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        return this.communityService.comActAnnouncementUpdate(comActAnnouncementVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActAnnouncementDelete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
New file
@@ -0,0 +1,71 @@
package com.panzhihua.applets.api;
import javax.annotation.Resource;
import javax.validation.Valid;
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.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
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.isNull;
import static java.util.Objects.nonNull;
/**
 * @title: ComPropertyPublicityApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传相关接口
 * @author: hans
 * @date: 2021/11/11 10:08
 */
@Slf4j
@Api(tags = {"物业宣传相关接口"})
@RestController
@RequestMapping("/property/publicity")
public class ComPropertyPublicityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "分页物业宣传信息", response = ComPropertyPublicityVO.class)
    @PostMapping("/page")
    public R pageComPropertyPublicity(@RequestBody @Valid PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        if (isNull(pageComPropertyPublicityDTO.getCommunityId())) {
            return R.fail("社区id不能为空");
        }
        LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            pageComPropertyPublicityDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        }
        return communityService.pageComPropertyPublicityApplet(pageComPropertyPublicityDTO);
    }
    @ApiOperation(value = "查看物业宣传信息", response = ComPropertyPublicityVO.class)
    @GetMapping("/get")
    @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
    public R getComPropertyPublicity(@RequestParam("id") Long id) {
        return communityService.getComPropertyPublicity(id);
    }
    @ApiOperation(value = "增加物业宣传浏览量")
    @GetMapping("/incr-view")
    @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
    public R incrPropertyPublicityView(@RequestParam("id") Long id) {
        return communityService.incrPropertyPublicityView(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -174,7 +174,7 @@
    @ApiOperation(value = "根据日期查询值班人员")
    @GetMapping("/app/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaPersonByDate(rotaDate);
        return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
    }
    /**
@@ -185,7 +185,7 @@
    @ApiOperation(value = "根据日期查询值班领导")
    @GetMapping("/app/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaLeaderByDate(rotaDate);
        return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -4,24 +4,35 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
/**
@@ -39,6 +50,8 @@
    private CommunityService communityService;
    @Resource
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;
    @ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
    @PostMapping("pagearea")
@@ -141,18 +154,24 @@
        return communityService.activityEvaluate(comActActEvaluateVO);
    }
    @ApiOperation(value = "我的评价", response = MyActivityEvaluateVO.class)
    @GetMapping("activity/my-evaluate")
    public R listMyActivityEvaluate(@RequestParam("activityId") Long activityId) {
        return communityService.listMyActivityEvaluate(getUserId(), activityId);
    }
    @ApiOperation(value = "报名/取消报名社区活动")
    @PutMapping("signactivity")
    public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
        Long userId = this.getUserId();
        Long activityId = signactivityVO.getActivityId();
        Integer isVolunteer = signactivityVO.getIsVolunteer();
        signactivityVO.setUserId(userId);
        R r = communityService.signActivity(signactivityVO);
        if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
            R r2 = communityService.detailActivity(activityId, userId,null,null);
            ComActActivityVO comActActivityVO =
                JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
            Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(1);
@@ -185,6 +204,39 @@
        }
        activitySignVO.setType(type);
        return communityService.listActivitySigns(activitySignVO);
    }
    @ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
            @ApiImplicitParam(name = "type", value = "活动类型,1.居民/志愿者活动 2.党员活动", required = true)
    })
    @GetMapping("activity/sign-in/list")
    public R listSignInRecord(@RequestParam("id")  Long id, @RequestParam("type") Integer type) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if (loginUserInfo.getIsCommunityWorker().intValue() != 1) {
            return R.fail("非社区工作人员");
        }
        if (type.intValue() == 1) {
            return communityService.listSignInRecord(id);
        }
        return R.fail("type不存在");
    }
    @ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "活动主键", required = true),
            @ApiImplicitParam(name = "type", value = "活动类型,1.居民/志愿者活动 2.党员活动", required = true),
            @ApiImplicitParam(name = "userId", value = "用户id", required = true)
    })
    @GetMapping("activity/regist/list")
    public R listRegistRecord(@RequestParam("id")  Long id,
                              @RequestParam("type") Integer type,
                              @RequestParam("userId") Long userId) {
        if (type.intValue() == 1) {
            return communityService.listRegistRecord(id, userId);
        }
        return R.fail("type不存在");
    }
    // @ApiOperation(value = "新增社区动态浏览记录")
@@ -257,4 +309,9 @@
        required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode);
    }
    @ApiOperation(value = "社区详情", response = ComActVO.class)
    @GetMapping("community")
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -343,7 +344,7 @@
        return R.ok(Constants.IS_SHOP_OPEN);
    }
    @ApiOperation(value = "获取最新活动和用户最新收益", response = ComActEasyPhotoRewardVO.class)
    @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class)
    @GetMapping("getUserReward")
    public R getUserReward(@RequestParam("communityId") Long communityId) {
        Long userId = 0L;
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -2,9 +2,15 @@
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaConfiguration;
@@ -73,6 +79,7 @@
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
        log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
        String openid = sessionInfo.getOpenid();
        String sessionKey = sessionInfo.getSessionKey();
        String unionid = sessionInfo.getUnionid();
@@ -83,6 +90,48 @@
        return tokenService.loginApplets(openid);
    }
    @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
    @PostMapping("loginH5")
    public R loginH5(@RequestBody LoginRequest loginRequest) {
        String code = loginRequest.getCode();
        if (ObjectUtils.isEmpty(code)) {
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaH5Service();
        WxMaJscode2SessionResult sessionInfo = null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
                sessionInfo = new WxMaJscode2SessionResult();
                sessionInfo.setOpenid("88888888");
                sessionInfo.setSessionKey("9999999");
            } else {
                return R.fail("微信登录失败");
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
        log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
        // 解密用户信息
//        WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(sessionInfo.getSessionKey(),
//                loginRequest.getEncryptedData(), loginRequest.getIv());
//        log.info("wxUserInfo信息【{}】", JSONObject.toJSONString(wxUserInfo));
//        if (null == wxUserInfo) {
//            return R.fail("获取用户信息失败");
//        }
//        String unionId = wxUserInfo.getUnionId();
        String unionId = sessionInfo.getUnionid();
        //通过unionId去匹配user
        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 r1;
    }
    @ApiOperation(value = "维护用户基本信息(昵称、性别、头像)")
    @PostMapping("updateUserWeiXinInfo")
    public R updateUserWeiXinInfo(@RequestBody LoginRequest loginRequest) {
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java
New file
@@ -0,0 +1,114 @@
package com.panzhihua.applets.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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:46:57
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁普通订单相关接口"})
@RequestMapping("rentingHourseOrder")
public class RentingHourseOrderApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = RentingHourseOrderVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectRentingHourseOrderAll(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "分页查询所有数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectRentingHourseOrderOne(id);
    }
    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @ApiOperation("创建订单")
    @PostMapping
    public R insert(@RequestBody RentingHourseOrderVO rentingHourseOrder) {
        rentingHourseOrder.setCommunityId(this.getCommunityId());
        return communityService.insertRentingHourseOrder(rentingHourseOrder);
    }
    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseOrderVO rentingHourseOrdervo) {
        return communityService.updateRentingHourseOrder(rentingHourseOrdervo);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteRentingHourseOrder(id);
    }
    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @ApiOperation("支付回调处理订单状态以及房屋状态")
    @PostMapping("/wxNotify")
    public R wxNotify(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO){
        return communityService.wxNotifyRentingHourseOrder(wxPayNotifyOrderVO);
    }
    /**
     * 支付付款
     */
    @ApiOperation("支付付款")
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody WxPayOrderVO wxPayOrderVO){
        return communityService.wxPayRentingHourseOrder(wxPayOrderVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java
New file
@@ -0,0 +1,95 @@
package com.panzhihua.applets.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.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:47:54
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁定金订单相关接口"})
@RequestMapping("rentingHoursePreOrder")
public class RentingHoursePreOrderApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = RentingHoursePreOrderVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectAllRentingHoursePreOrder(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "详情",response = RentingHoursePreOrderVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneRentingHoursePreOrder(id);
    }
    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "创建定金订单")
    @PostMapping
    public R insert(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        rentingHoursePreOrderVO.setCommunityId(this.getCommunityId());
        return communityService.insertRentingHoursePreOrder(rentingHoursePreOrderVO);
    }
    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改")
    @PostMapping("/update")
    public R update(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
       return communityService.updateRentingHoursePreOrder(rentingHoursePreOrderVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteRentingHoursePreOrder(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java
New file
@@ -0,0 +1,210 @@
package com.panzhihua.applets.api;
import java.util.Objects;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.validation.annotation.Validated;
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.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.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.TencentUtils;
import com.panzhihua.common.validated.AddGroup;
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: RentingHousesApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁相关接口
 * @author: hans
 * @date: 2021/11/24 10:18
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁相关接口"})
@RequestMapping("/renting/houses")
public class RentingHousesApi extends BaseController {
    private static final int NOT_COMMUNITY_WORKER = 2;
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;
    @ApiOperation("新增房源信息")
    @PostMapping("/register")
    public R registerRentingHouse(@RequestBody @Validated(AddGroup.class) RentingHouseRegisterDTO registerDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        checkIsCommunityWorker(loginUserInfo);
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.registerRentingHouse(registerDTO);
    }
    @ApiOperation("编辑房源信息")
    @PostMapping("/update")
    public R updateRentingHouse(@RequestBody @Validated(PutGroup.class) RentingHouseRegisterDTO registerDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        checkIsCommunityWorker(loginUserInfo);
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.updateRentingHouse(registerDTO);
    }
    @ApiOperation(value = "工作人员-分页获取房源信息", response = RentingHouseRegisterVO.class)
    @PostMapping("/pageAdmin")
    public R pageRentingHouse(@RequestBody @Valid PageRentingHouseRegisterDTO pageRegisterDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        pageRegisterDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageRentingHouse(pageRegisterDTO);
    }
    @ApiOperation("发布/取消发布 房源信息")
    @PutMapping("/releaseOrCancel")
    public R releaseOrCancelHouse(@RequestBody @Valid ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        checkIsCommunityWorker(loginUserInfo);
        return communityService.releaseOrCancelHouse(releaseOrCancelHouseDTO);
    }
    @ApiOperation(value = "获取详情-房源信息", response = RentingHouseRegisterVO.class)
    @GetMapping("/get")
    @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
    public R getRentingHouse(@RequestParam("registerId") Long registerId) {
        LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
        Integer isLandlord = 2;
        R rentingHouseR = communityService.getRentingHouse(registerId);
        if (R.isOk(rentingHouseR)) {
            RentingHouseRegisterVO houseRegisterVO = JSONObject.parseObject(JSONObject.toJSONString(rentingHouseR.getData()), RentingHouseRegisterVO.class);
            if (Objects.nonNull(loginUserInfoSureNoLogin)) {
                String userId = loginUserInfoSureNoLogin.getUserId().toString();
                R<LoginUserInfoVO> infoVOR = userService.getUserInfoByUserId(userId);
                if (R.isOk(infoVOR)) {
                    LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(infoVOR.getData()), LoginUserInfoVO.class);
                    if (houseRegisterVO.getHourseIdCard().equals(loginUserInfoVO.getIdCard())) {
                        isLandlord = 1;
                    }
                }
            }
            houseRegisterVO.setIsLandlord(isLandlord);
            return R.ok(houseRegisterVO);
        }
        return rentingHouseR;
    }
    @ApiOperation("房源认证获取eidToken")
    @GetMapping("/getEidToken")
    public R getEidToken(@RequestParam("registerId") Long registerId){
        R r=communityService.getRentingHouse(registerId);
        if(R.isOk(r)){
            RentingHouseRegisterVO registerVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),RentingHouseRegisterVO.class);
            String result=TencentUtils.getEidToken(registerVO.getHourseOwnerName(),registerVO.getHourseIdCard());
            return R.ok(result);
        }
        return R.fail();
    }
    @ApiOperation("房源认证")
    @GetMapping("/auth")
    public R authHouse(@RequestParam("registerId") Long registerId,@RequestParam("result")String result){
        R r=communityService.getRentingHouse(registerId);
        if(R.isOk(r)){
            String response=TencentUtils.getEidResult(result);
            JSONObject object = JSON.parseObject(response);
            if (object == null) {
                return R.fail("核验失败");
            }
            JSONObject textObject = object.getJSONObject("Text");
            String code = textObject.getString("ErrCode");
            if (!code.equals("0")) {
                log.error("人脸核验失败,错误原因:" + textObject.toJSONString());
                return R.fail("核验失败");
            }
            RentingHouseRegisterDTO registerDTO=new RentingHouseRegisterDTO();
            registerDTO.setId(registerId);
            registerDTO.setAuthStatus(2);
            registerDTO.setDetailStatus(2);
            registerDTO.setHourseOwnerUserId(getUserId());
            return communityService.updateRentingHouse(registerDTO);
        }
        return R.fail();
    }
    /**
     * 附近的房源
     */
    @ApiOperation(value = "附近的房源",response =RentingHouseRegisterVO.class)
    @PostMapping("/nearby")
    public R nearby(@RequestBody NearbyDTO nearbyDTO){
        LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
        if (Objects.nonNull(loginUserInfoSureNoLogin)) {
            nearbyDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        }
        return communityService.nearby(nearbyDTO);
    }
    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @ApiOperation(value = "小程序分页获取房源信息",response =RentingHouseRegisterVO.class)
    @PostMapping("/houseList")
    public R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO) {
        Integer isMy = pageRegisterDTO.getIsMy();
        if (Objects.nonNull(isMy) && isMy.intValue() == 1) {
            pageRegisterDTO.setCurrentUserId(getUserId());
        }
        return communityService.pageRentingHouseApplet(pageRegisterDTO);
    }
    @ApiOperation(value = "获取房屋租赁配置",response = RentingHousesConfigVO.class)
    @GetMapping("/getConfig")
    @ApiImplicitParam(name = "type", value = "配置类型(1.房屋租赁合同 2.租赁合同变更协议 3.定金协议 4.房屋委托代理合同" +
            "5.平台须知 6.房源标签)", required = true)
    public R getRentingHouseConfig(@RequestParam("type") Integer type) {
        return communityService.getRentingHouseConfig(type);
    }
    @ApiOperation("删除房源信息")
    @DeleteMapping("/delete")
    @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
    public R deleteRentingHouse(@RequestParam("registerId") Long registerId) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        checkIsCommunityWorker(loginUserInfo);
        return communityService.deleteRentingHouse(registerId);
    }
    private void checkIsCommunityWorker(LoginUserInfoVO loginUserInfo) {
        if (loginUserInfo.getIsCommunityWorker().intValue() == NOT_COMMUNITY_WORKER) {
            throw new ServiceException("401", "暂无权限");
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -6,12 +6,15 @@
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import com.panzhihua.common.constants.HttpStatus;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
@@ -95,7 +98,22 @@
            Object data = r.getData();
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
                //是否保存unionid
//                if (Objects.isNull(loginUserInfoVO.getUnionid()) || "无".equals(loginUserInfoVO.getUnionid())) {
//                    return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
//                }
                R r1 = communityService.detailHouse(userId);
                if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
                    //查询实名用户绑定的实有人口地址
                    R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
                    if(R.isOk(r4)){
                        String address= (String) r4.getData();
                        if(StringUtils.isNotEmpty(address)){
                            loginUserInfoVO.setAddress(address);
                            r.setData(loginUserInfoVO);
                        }
                    }
                }
                if (null != communityId && 0 != communityId) {
                    R r2 = communityService.detailCommunity(communityId);
                    if (R.isOk(r2)) {
@@ -250,17 +268,18 @@
    }
    @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
    @ApiImplicitParam(name = "status", value = "活动状态(4 进行中 5 已结束 6 已取消)", required = false)
    @GetMapping("listactivity")
    public R listActivity() {
    public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        R r = communityService.listActivity(userId);
        R r = communityService.listActivity(userId, status);
        if (R.isOk(r)) {
            comActActivityVOS = (List<ComActActivityVO>)r.getData();
        }
        R r1 = partyBuildingService.listActivity(userId, communityId);
        R r1 = partyBuildingService.listActivity(userId, communityId, status);
        if (R.isOk(r1)) {
            List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
            comActActivityVOS.addAll(data);
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java
New file
@@ -0,0 +1,58 @@
package com.panzhihua.applets.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import lombok.Data;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微信配置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-23 14:52
 **/
@Data
@Component
@ConfigurationProperties(prefix = "wx.h5")
public class WxH5Properties {
    /**
     * 设置微信小程序的appid
     */
    private String appid;
    /**
     * 设置微信小程序的Secret
     */
    private String secret;
    /**
     * 设置微信小程序消息服务器配置的token
     */
    private String token;
    /**
     * 设置微信小程序消息服务器配置的EncodingAESKey
     */
    private String aesKey;
    /**
     * 消息格式,XML或者JSON
     */
    private String msgDataFormat;
    /**
     * 商户号
     */
    private String mchId;
    /**
     * 微信支付密钥
     */
    private String payKey;
    /**
     * 微信支付回调地址
     */
    private String notifyUrl;
}
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
@@ -22,6 +22,9 @@
    @Resource
    private WxMaProperties properties;
    @Resource
    private WxH5Properties wxH5Properties;
    public WxMaService getMaService() {
        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
        config.setAppid(properties.getAppid());
@@ -31,4 +34,14 @@
        wxMaService.setWxMaConfig(config);
        return wxMaService;
    }
    public WxMaService getMaH5Service() {
        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
        config.setAppid(wxH5Properties.getAppid());
        config.setSecret(wxH5Properties.getSecret());
        config.setMsgDataFormat(wxH5Properties.getMsgDataFormat());
        WxMaService wxMaService = new WxMaServiceImpl();
        wxMaService.setWxMaConfig(config);
        return wxMaService;
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java
New file
@@ -0,0 +1,50 @@
package com.panzhihua.applets_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.common.controller.BaseController;
import io.swagger.annotations.Api;
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.RestController;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiOperation;
/**
 * @title: RentingHousesContractConfigApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁配置相关接口
 * @author: hans
 * @date: 2021/11/23 13:32
 */
@RestController
@Api(tags = {"房屋租赁配置"})
@RequestMapping("/rentingHousesConfig")
public class RentingHousesContractConfigApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @PostMapping("/page")
    @ApiOperation(value = "分页查询房屋租赁基础配置", response = RentingHousesConfigVO.class)
    public R pageRentingHousesConfig(@RequestBody @Valid PageRentingHousesConfigDTO pageRentingHousesConfigDTO) {
        return communityService.pageRentingHousesConfig(pageRentingHousesConfigDTO);
    }
    @PutMapping("/update")
    @ApiOperation("更新配置信息")
    public R updateRentingHousesConfig(@RequestBody @Valid RentingHousesConfigDTO rentingHousesConfigDTO) {
        rentingHousesConfigDTO.setUserId(getUserId());
        return communityService.updateRentingHousesConfig(rentingHousesConfigDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -227,4 +227,16 @@
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
        return R.ok(loginReturnVO);
    }
    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
        return R.ok(loginReturnVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -122,4 +122,12 @@
     * @return 登录结果
     */
    LoginReturnVO loginMerchantBackStage(String account, String password);
    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    LoginReturnVO loginXQDP(String account, String password);
}
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -111,6 +111,7 @@
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        return loginReturnVO;
    }
@@ -235,7 +236,6 @@
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setUserId(loginUser.getUserId());
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        return loginReturnVO;
    }
@@ -256,4 +256,22 @@
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @Override
    public LoginReturnVO loginXQDP(String account, String password){
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/common.iml
@@ -150,5 +150,7 @@
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
  </component>
</module>
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java
@@ -90,4 +90,9 @@
     * 接口未实现
     */
    public static final int NOT_IMPLEMENTED = 501;
    /**
     * 暂不支持
     */
    public static final int NOT_ACCEPTABLE = 406;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java
New file
@@ -0,0 +1,15 @@
package com.panzhihua.common.enums;
/**
 * @title: PresetPictureType
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 预设图片类型
 * @author: hans
 * @date: 2021/11/23 17:31
 */
public class PresetPictureType {
    /**
     * 物业宣传
     */
    public static Integer PROPERTY_PUBLICITY = 1;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
@@ -98,7 +98,7 @@
                vo.setVillageName(oneData.get(1));
                if (StringUtils.isEmpty(oneData.get(2))) {
                    ComMngPopulationImportErrorVO importErrorVO = setError(oneData);
                    importErrorVO.setErrorMsg("门牌号不能为空");
                    importErrorVO.setErrorMsg("街路巷号不能为空");
                    populationImportErrorVOList.add(importErrorVO);
                    continue;
                }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.dtos;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageBaseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页基础数据DTO
 * @author: hans
 * @date: 2021/12/21 14:22
 */
@Data
@ApiModel(value = "分页基础数据DTO")
public class PageBaseDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
    @ApiModelProperty(value = "查询参数id", example = "10")
    private Long paramId;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
@@ -4,6 +4,7 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -12,6 +13,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @title: AddIdentityAuthDTO
@@ -62,4 +65,11 @@
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty("认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date authTime;
    @ApiModelProperty("认证期数")
    private String authPeriod;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -218,6 +218,8 @@
    @ApiModelProperty("等级是否查询全部(1.是 2.否)")
    private Integer levelIsAll;
    @ApiModelProperty("是否死亡人员 (1.是 2.否)")
    private Integer isDeath;
    public interface levelIsAll{
        int yes = 1;
        int no = 2;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java
New file
@@ -0,0 +1,61 @@
package com.panzhihua.common.model.dtos.community;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComPropertyPublicityDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增/编辑物业宣传
 * @author: hans
 * @date: 2021/11/11 10:55
 */
@Data
@ApiModel("新增/编辑物业宣传")
public class ComPropertyPublicityDTO {
    @ApiModelProperty("物业宣传id")
    @NotNull(groups = PutGroup.class, message = "物业宣传id不能为空")
    private Long id;
    @ApiModelProperty("宣传标题")
    @NotBlank(groups = AddGroup.class, message = "宣传标题不能为空")
    private String title;
    @ApiModelProperty("宣传类型(0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主)")
    @NotNull(groups = AddGroup.class, message = "宣传类型不能为空")
    private Integer publicityType;
    @ApiModelProperty("其他类型自定义名称")
    private String other;
    @ApiModelProperty("封面")
    @NotBlank(groups = AddGroup.class, message = "封面不能为空")
    private String cover;
    @ApiModelProperty("内容形式(1.文章链接 2.自定义内容)")
    @NotNull(groups = AddGroup.class, message = "内容形式不能为空")
    private Integer contentType;
    @ApiModelProperty("文章链接")
    private String articleUrl;
    @ApiModelProperty("自定义内容")
    private String diyContent;
    @ApiModelProperty(value = "物业公司id", hidden = true)
    private Long propertyId;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java
New file
@@ -0,0 +1,48 @@
package com.panzhihua.common.model.dtos.community;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageComPropertyPublicityDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询物业宣传信息请求参数
 * @author: hans
 * @date: 2021/11/11 10:32
 */
@Data
@ApiModel("分页查询物业宣传信息请求参数")
public class PageComPropertyPublicityDTO {
    @ApiModelProperty("关键词")
    private String keyword;
    @ApiModelProperty("物业公司id")
    private Long propertyId;
    @ApiModelProperty("小区id")
    private Long villageId;
    @ApiModelProperty("宣传类型(0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主)")
    private Integer publicityType;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageSize;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java
@@ -13,4 +13,7 @@
    @ApiModelProperty(value = "事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)", required = true)
    private Integer type;
    @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
    private Integer eventType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
@@ -11,7 +11,7 @@
    @ApiModelProperty("业务id")
    private Long serviceId;
    @ApiModelProperty("积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)")
    @ApiModelProperty("积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动 )")
    private Integer integralType;
    @ApiModelProperty(value = "社区id")
@@ -23,6 +23,12 @@
    @ApiModelProperty(value = "是否是评论(1.是 2.否)")
    private Integer isComment;
    @ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
    private Integer activityType;
    @ApiModelProperty(value = "是否是志愿者 0 不是 1 是")
    private Integer isVolunteer;
    public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
        this.serviceId = serviceId;
        this.integralType = integralType;
@@ -33,15 +39,16 @@
    public AddComActIntegralUserDTO() {}
    /**
     * 积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)
     * 积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动 )
     */
    public interface integralType {
        int fbssp = 1;
        int fbwxy = 2;
        int cyystp = 3;
        int cyzyzhd = 4;
        int cysqhd = 5;
        int cyjmhd = 4;
        int cyzyzhd = 5;
        int cydyhd = 6;
        int cydcwj = 7;
        int qxhd = 8;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel
public class NearbyDTO {
    @ApiModelProperty("经度")
    private String longitude;
    @ApiModelProperty("纬度")
    private String latitude;
    @ApiModelProperty("距离(千米)")
    private Integer distance;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("社区id")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java
New file
@@ -0,0 +1,91 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @title: PageRentingHouseRegisterDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询房屋租赁信息
 * @author: hans
 * @date: 2021/11/24 16:07
 */
@Data
@ApiModel("分页查询房屋租赁信息请求参数")
public class PageRentingHouseRegisterDTO {
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty(value = "户型(室数量)")
    private Integer brn;
    @ApiModelProperty(value = "更多户型(x室以上此值应传入1)")
    private Integer moreBrn;
    @ApiModelProperty(value = "装修情况(1.毛坯房 2.简装 3.精装修)")
    private Integer decoration;
    @ApiModelProperty(value = "朝向(1.东 2.南 3.西 4.北 5.东南 6.东北 7.西南 8.西北 9.南北 10.东西)")
    private Integer orientation;
    @ApiModelProperty(value = "最小面积")
    private BigDecimal minArea;
    @ApiModelProperty(value = "最大面积")
    private BigDecimal maxArea;
    @ApiModelProperty(value = "最低租金")
    private BigDecimal minRentMoney;
    @ApiModelProperty(value = "最高租金")
    private BigDecimal maxRentMoney;
    @ApiModelProperty(value = "房屋状态(1、待发布 2、待出租 3、出租中 4、已退租")
    @NotNull(message = "房屋状态不能为空")
    private Integer status;
    @ApiModelProperty(value = "1、待认证 2、待发布 3、待出租 4、保留中 5、出租中 6、已超时 7、已到期)")
    private Integer detailStatus;
    @ApiModelProperty(value = "到期时间-起")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date expireDateBegin;
    @ApiModelProperty(value = "到期时间-止")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date expireDateEnd;
    @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;
    @ApiModelProperty("排序条件 1距离远到近 2 近到远 3 租金高到低 4 租金低到高")
    private Integer sort;
    @ApiModelProperty(value = "房屋的经度")
    private String longitude;
    @ApiModelProperty(value = "房屋的纬度")
    private String latitude;
    @ApiModelProperty("我的房源时传入1")
    private Integer isMy;
    @ApiModelProperty(value = "当前用户id", hidden = true)
    private Long currentUserId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java
New file
@@ -0,0 +1,27 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: PageRentingHousesConfigDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description:
 * @author: hans
 * @date: 2021/11/23 13:42
 */
@Data
@ApiModel("分页查询房屋租赁配置请求参数")
public class PageRentingHousesConfigDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java
New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ReleaseOrCancelHouseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 发布/取消发布 房源信息请求参数
 * @author: hans
 * @date: 2021/11/25 11:10
 */
@Data
@ApiModel("发布/取消发布 房源信息请求参数")
public class ReleaseOrCancelHouseDTO {
    @ApiModelProperty(value = "请求类型(1.发布 2.取消)", allowableValues = "1,2", required = true)
    @NotNull(message = "请求类型不能为空")
    @Min(1)
    @Max(2)
    private Integer type;
    @ApiModelProperty(value = "房源登记id", required = true)
    @NotNull(message = "房源登记id不能为空")
    private Long registerId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java
New file
@@ -0,0 +1,172 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import java.math.BigDecimal;
import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: RentingHouseRegisterDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房源登记请求类
 * @author: hans
 * @date: 2021/11/24 10:26
 */
@Data
@ApiModel("房源登记请求类")
public class RentingHouseRegisterDTO {
    @ApiModelProperty("id")
    @NotNull(groups = PutGroup.class, message = "id不能为空")
    private Long id;
    @ApiModelProperty(value = "地址")
    @NotBlank(groups = AddGroup.class, message = "地址不能为空")
    private String address;
    @ApiModelProperty(value = "小区名称")
    @NotBlank(groups = AddGroup.class, message = "小区名称不能为空")
    private String villageName;
    @ApiModelProperty(value = "街/路/巷")
    @NotBlank(groups = AddGroup.class, message = "街/路/巷不能为空")
    private String alley;
    @ApiModelProperty(value = "街/路/巷号")
    @NotBlank(groups = AddGroup.class, message = "街/路/巷号不能为空")
    private String houseNum;
    @ApiModelProperty(value = "楼栋号")
    private String buildingNo;
    @ApiModelProperty(value = "单元号")
    private String unitNo;
    @ApiModelProperty(value = "楼层号")
    private String floor;
    @ApiModelProperty(value = "户室(房间号)")
    private String houseNo;
    @ApiModelProperty(value = "看房电话")
    @Pattern(groups = {AddGroup.class}, message = "看房电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String seeHourseTelephone;
    @ApiModelProperty(value = "租房标题")
    @NotBlank(groups = AddGroup.class, message = "租房标题不能为空")
    private String title;
    @ApiModelProperty(value = "室数量")
    @NotNull(groups = {AddGroup.class}, message = "室数量不能为空")
    private Integer brn;
    @ApiModelProperty(value = "厅数量")
    @NotNull(groups = {AddGroup.class}, message = "厅数量不能为空")
    private Integer lrn;
    @ApiModelProperty(value = "卫数量")
    @NotNull(groups = {AddGroup.class}, message = "卫数量不能为空")
    private Integer wcn;
    @ApiModelProperty(value = "月租金")
    @NotNull(groups = {AddGroup.class}, message = "月租金不能为空")
    private BigDecimal monthlyRentMoney;
    @ApiModelProperty(value = "保证金")
    @NotNull(groups = {AddGroup.class}, message = "保证金不能为空")
    private BigDecimal depositMoney;
    @ApiModelProperty(value = "服务费")
    @NotNull(groups = {AddGroup.class}, message = "服务费不能为空")
    private BigDecimal serverCharge;
    @ApiModelProperty(value = "定金")
    @NotNull(groups = {AddGroup.class}, message = "定金不能为空")
    private BigDecimal dingMoney;
    @ApiModelProperty(value = "建筑面积")
    private BigDecimal constructArea;
    @ApiModelProperty(value = "总楼层")
    @NotBlank(groups = AddGroup.class, message = "总楼层不能为空")
    private String totalFloor;
    @ApiModelProperty(value = "朝向(1东2南3西4北5东南6东北7西南8西北9南北10东西)")
    private Integer orientation;
    @ApiModelProperty(value = "装修情况(1.毛坯房 2.简装 3.精装修)")
    @NotNull(groups = {AddGroup.class}, message = "装修情况不能为空")
    private Integer decoration;
    @ApiModelProperty(value = "看房时间(1.随时看房 2.提前预约)")
    @NotNull(groups = {AddGroup.class}, message = "看房时间不能为空")
    private Integer seeHourseDate;
    @ApiModelProperty(value = "房源介绍")
    private String hourseDescription;
    @ApiModelProperty(value = "入住要求")
    private String checkInRequirement;
    @ApiModelProperty(value = "房内物品")
    private String hourseItem;
    @ApiModelProperty(value = "房屋标签(多个逗号隔开)")
    private String label;
    @ApiModelProperty(value = "房主姓名")
    @NotBlank(groups = AddGroup.class, message = "房主姓名不能为空")
    private String hourseOwnerName;
    @ApiModelProperty(value = "房主身份证")
    @NotBlank(groups = AddGroup.class, message = "房主身份证不能为空")
    private String hourseIdCard;
    @ApiModelProperty(value = "房主电话")
    @Pattern(groups = {AddGroup.class}, message = "房主电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String hoursePhone;
    @ApiModelProperty(value = "房屋的经度")
    @NotBlank(groups = AddGroup.class, message = "房屋的经度不能为空")
    private String longitude;
    @ApiModelProperty(value = "房屋的纬度")
    @NotBlank(groups = AddGroup.class, message = "房屋的纬度不能为空")
    private String latitude;
    @ApiModelProperty(value = "房源图片")
    private List<String> housePictures;
    @ApiModelProperty(value = "产权证明")
    @NotEmpty(groups = {AddGroup.class}, message = "产权证明不能为空")
    private List<String> propertyPictures;
    @ApiModelProperty(value = "证件照片")
    @NotEmpty(groups = {AddGroup.class}, message = "证件照片不能为空")
    private List<String> credentialsPictures;
    @ApiModelProperty(value = "当前用户", hidden = true)
    private Long userId;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "认证状态(1、未认证2、已认证)", hidden = true)
    private Integer authStatus;
    @ApiModelProperty(value = "1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期)", hidden = true)
    private Integer detailStatus;
    @ApiModelProperty(value = "房东的用户ID,用户表记录了房东的详细信息", hidden = true)
    private Long hourseOwnerUserId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java
New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.dtos.community.rentingHouses;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: RentingHousesConfigDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁配置请求参数
 * @author: hans
 * @date: 2021/11/23 13:54
 */
@Data
@ApiModel("房屋租赁配置请求参数")
public class RentingHousesConfigDTO {
    @ApiModelProperty("id")
    @NotNull(message = "id不能为空")
    private Long id;
    @ApiModelProperty("配置内容(标签类型用逗号隔开)")
    @NotBlank(message = "配置内容为空")
    private String value;
    @ApiModelProperty(value = "当前用户", hidden = true)
    private Long userId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
@@ -25,4 +25,13 @@
    @ApiModelProperty(value = "预约登记id")
    private Long reserveId;
    @ApiModelProperty(value = "关键字")
    private String keyword;
    @ApiModelProperty(value = "来攀/离攀开始时间")
    private String beginTime;
    @ApiModelProperty(value = "来攀/离攀结束时间")
    private String stopTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java
@@ -34,7 +34,7 @@
    private String handlePhotoList;
    @Max(127)
    @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
    @ApiModelProperty(value = "是否公示(1.是 2.否)", hidden = false, example = "1")
    private Integer isPublicity;
    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java
@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "小区地址")
    private String address;
    @ApiModelProperty(value = "网格id")
    private Long gridId;
    public String getSortColumns() {
        // String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return sortAttr;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java
@@ -31,6 +31,9 @@
    @ApiModelProperty(value = "特殊人员标签")
    private String label;
    @ApiModelProperty(value = "网格id")
    private Long gridId;
    private Integer outOrLocal;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java
@@ -17,4 +17,6 @@
    private String token;
    @ApiModelProperty("刷新token有效期长")
    private String refreshToken;
    @ApiModelProperty("communityId")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -184,6 +184,11 @@
    @ApiModelProperty("是否社区工作人员 1.是 2.否")
    private Integer isCommunityWorker;
    @ApiModelProperty("实名认证地址")
    private String address;
    @ApiModelProperty("是否物业工作人员 1.是 2.否")
    private Integer isPropertyWorker;
    @ApiModelProperty("街道id")
    private Long streetId;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @title: ActivitySignInRecordVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 活动报名签到记录
 * @author: hans
 * @date: 2021/10/19 9:22
 */
@Data
@ApiModel("活动报名签到记录")
public class ActivitySignInRecordVO {
    @ApiModelProperty("活动类型,1.居民/志愿者活动 2.党员活动")
    private Integer type;
    @ApiModelProperty("活动主键")
    private Long activityId;
    @ApiModelProperty("真实名字")
    private String name;
    @ApiModelProperty("报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("用户id")
    private Long userId;
    @ApiModelProperty("参与次数")
    private Integer times;
    @ApiModelProperty("活动限制次数")
    private Integer limit;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -44,4 +44,33 @@
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
    /**
     * 报名状态 0 已取消 1已报名
     */
    @ApiModelProperty("报名状态 0 已取消 1已报名")
    private Integer status;
    /**
     * 取消原因
     */
    @ApiModelProperty("取消原因")
    private String reason;
    /**
     * 参与次数
     */
    @ApiModelProperty("参与次数")
    private Integer times;
    /**
     * 获取奖励
     */
    @ApiModelProperty("获取奖励")
    private Integer award;
    /**
     * 活动限制次数
     */
    @ApiModelProperty("活动限制次数")
    private Integer limit;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java
New file
@@ -0,0 +1,11 @@
package com.panzhihua.common.model.vos.community;
import lombok.Data;
/**
 * @author zzj
 */
@Data
public class Base64File {
    private String file;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java
@@ -33,7 +33,7 @@
    @ExcelProperty(value = "评价时间", index = 0)
    private Date createAt;
    @ExcelProperty(value = "评价星级", index = 4)
    @ExcelProperty(value = "评分星级", index = 4)
    private String starLevel;
    @ExcelProperty(value = "评价详情", index = 5)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
@@ -19,18 +19,24 @@
@ApiModel("社区活动签到表")
public class ComActActRegistExcelVO {
    @ExcelProperty(value = "姓名", index = 1)
    @ExcelProperty(value = "姓名", index = 3)
    private String name;
    @ExcelProperty(value = "身份", index = 2)
    @ExcelProperty(value = "身份", index = 4)
    private String identity;
    @ExcelProperty(value = "电话", index = 4)
    @ExcelProperty(value = "电话", index = 6)
    private String phone;
    @ExcelProperty(value = "签到时间(未签到就是报名时间)", index = 0)
    @ExcelProperty(value = "签到时间", index = 0)
    private Date createAt;
    @ExcelProperty(value = "人群标签", index = 3)
    @ExcelProperty(value = "人群标签", index = 5)
    private String tags;
    @ExcelProperty(value = "签到地点", index = 1)
    private String position;
    @ExcelProperty(value = "签到次数", index = 2)
    private Integer times;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
@@ -65,4 +65,27 @@
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
    @ApiModelProperty(value = "签到位置")
    private String position;
    @ApiModelProperty(value = "签到次数")
    private Integer times;
    @ApiModelProperty(value = "二维码id")
    private Integer codeId;
    @ApiModelProperty(value = "本次签到获取的积分奖励")
    private Integer award;
    @ApiModelProperty(value = "活动类型 1居民,志愿者 2党员")
    private Integer activityType;
    @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;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -31,6 +32,28 @@
    @ExcelProperty(value = "报名时间", index = 0)
    private Date createAt;
    @ExcelProperty(value = "人群标签", index = 3)
    @ExcelProperty(value = "人员标签", index = 3)
    private String tags;
    @ExcelProperty(value = "报名状态",index = 5)
    private String status;
    @ExcelProperty(value = "取消原因", index = 6)
    private String reason;
    @ExcelProperty(value = "参与情况", index = 7)
    private String condition;
    @ExcelProperty(value = "获得奖励", index = 8)
    private String award;
    @ExcelIgnore
    private Integer times;
    @ExcelIgnore
    private Integer limit;
    public void generateCondition() {
        if(this.times!=null&&this.limit!=null){
            this.condition = "("+times+"/"+ (limit.equals(-1) ? "无限" : limit) +")";
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComActActivityTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 活动分类vo
 * @author: hans
 * @date: 2021/10/21 11:11
 */
@Data
@ApiModel("活动分类vo")
public class ComActActivityTypeVO {
    @ApiModelProperty("自增id")
    private Long id;
    @ApiModelProperty("类型名称")
    @NotBlank(groups = AddGroup.class, message = "类型名称不能为空")
    private String name;
    @ApiModelProperty("活动类型(1.志愿者 2.居民 3.党员)")
    @NotNull(groups = AddGroup.class, message = "活动类型不能为空")
    private Integer type;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -4,7 +4,11 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +28,7 @@
    private Long id;
    @ApiModelProperty("活动名称")
    @NotBlank(groups = AddGroup.class, message = "活动名称不可为空")
    private String activityName;
    @ApiModelProperty("负责人userID")
@@ -33,12 +38,15 @@
    private String sponsorName;
    @ApiModelProperty("活动地址")
    @NotBlank(groups = AddGroup.class, message = "活动地址不可为空")
    private String activityAddr;
    @ApiModelProperty("纬度")
    @NotBlank(groups = AddGroup.class, message = "纬度不可为空")
    private String lat;
    @ApiModelProperty("经度")
    @NotBlank(groups = AddGroup.class, message = "经度不可为空")
    private String lng;
    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -47,20 +55,25 @@
    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date publishAt;
    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "活动结束时间不可为空")
    private Date endAt;
    @ApiModelProperty("活动开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "活动开始时间不可为空")
    private Date beginAt;
    @ApiModelProperty("报名开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "报名开始时间不可为空")
    private Date signUpBegin;
    @ApiModelProperty("报名结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull(groups = AddGroup.class, message = "报名结束时间不可为空")
    private Date signUpEnd;
    @ApiModelProperty("参加人群(多个以逗号隔开)")
@@ -85,6 +98,7 @@
    private Integer participantNow;
    @ApiModelProperty("活动封面")
    @NotBlank(groups = AddGroup.class, message = "活动封面不可为空")
    private String cover;
    @ApiModelProperty("是否有奖品 1 有 0  无")
@@ -100,6 +114,7 @@
    private String contactName;
    @ApiModelProperty("联系人电话")
    @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
    private String contactPhone;
    @ApiModelProperty("是否签到 1 是 0否")
@@ -115,6 +130,7 @@
    private String rewardDesc;
    @ApiModelProperty("活动内容")
    @NotBlank(groups = AddGroup.class, message = "活动内容不可为空")
    private String content;
    @ApiModelProperty("活动奖品集合")
@@ -191,4 +207,41 @@
    @ApiModelProperty(value = "查询筛选:0-本小区 1-全部")
    private Integer choice;
    @ApiModelProperty("签到范围,默认0无限制")
    @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
    private Integer range;
    @ApiModelProperty("是否有积分奖励(1.是 2.否)")
    @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
    private Integer haveIntegralReward;
    @ApiModelProperty("积分奖励方式(1.按次奖励 2.记时奖励)")
    private Integer rewardWay;
    @ApiModelProperty("参与签到/打卡奖励积分")
    private Integer rewardIntegral;
    @ApiModelProperty("参与次数上限,按次奖励需传入,无次数限制-1")
    private Integer limit;
    @ApiModelProperty("是否允许取消(1.允许 2.不允许)")
    @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
    private Integer canCancel;
    @ApiModelProperty("取消活动扣除积分数目")
    @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
    private Integer cancelDeduct;
    @ApiModelProperty("用户已参与次数")
    private Integer times;
    @ApiModelProperty("已获取积分")
    private Integer award;
    @ApiModelProperty("二维码类型 1居民,志愿者 2党员")
    private Integer codeType;
    @ApiModelProperty("活动类型")
    @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
    private String activityType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class ComActAnnouncementVO {
    private Long id;
    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * 发布人id
     */
    @ApiModelProperty(value = "发布人id")
    private Long userId;
    /**
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    private Long columnId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 发布人
     */
    @ApiModelProperty("发布人")
    private String username;
    @ApiModelProperty("分类名称")
    private String columnName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
@@ -51,9 +51,11 @@
    private Integer status;
    /**
     * 分类类型 1服务类型分类 2技能分类
     * 分类类型 1服务类型分类 2技能分类 3通知公告
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类")
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
    private Integer type;
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -91,4 +91,10 @@
    @ApiModelProperty(value = "查询筛选:0-本小区 1-全部")
    private Integer choice;
    @ApiModelProperty(value = "社区动态跳转链接")
    private String jumpUrl;
    @ApiModelProperty("跳转状态")
    private Integer jumpType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.List;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,4 +39,7 @@
    @ApiModelProperty("应用预约/登记列表")
    private List<ComActReserveIndexVo> comActReserveIndexApplicationVos;
    @ApiModelProperty("动态banner")
    private List<BannerVO> bannerVOS;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java
New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author lyq
 * 社区账号密码返回参数
 */
@Data
@ApiModel("社区账号密码返回参数")
public class ComActPasswordVo {
    @ApiModelProperty("账号")
    private String account;
    @ApiModelProperty("密码")
    private String password;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.vos.community;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: ComActPictureLibraryVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 公共预设图库信息
 * @author: hans
 * @date: 2021/11/23 17:16
 */
@Data
@ApiModel("公共预设图库信息")
public class ComActPictureLibraryVO {
    @ApiModelProperty("操作内容")
    private List<String> presetPictures;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
@@ -34,10 +34,11 @@
    @ApiModelProperty("题目id")
    private Long reserveSubId;
    @ApiModelProperty("填报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date time;
    @ApiModelProperty("用户昵称")
    private String nickName;
    @ApiModelProperty("选项类型(0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传)")
    @ApiModelProperty("选项类型(0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传 12签名)")
    private Integer optionType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
@@ -101,7 +101,7 @@
    private Integer authStatus;
    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date authDate;
    @ApiModelProperty(value = "创建时间")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
@@ -28,10 +28,10 @@
    @ExcelProperty(value = "小区名称", index = 1)
    private String villageName;
    @ExcelProperty(value = "门牌号", index = 2)
    @ExcelProperty(value = "街路巷号", index = 2)
    private String doorNo;
    @ExcelProperty(value = "楼栋号/楼栋名称", index = 3)
    @ExcelProperty(value = "楼栋号", index = 3)
    private String name;
//    @ExcelProperty(value = "单元数", index = 6)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java
@@ -21,10 +21,10 @@
    @ExcelProperty(value = "小区名称", index = 1)
    private String villageName;
    @ExcelProperty(value = "门牌号", index = 2)
    @ExcelProperty(value = "街路巷号", index = 2)
    private String doorNo;
    @ExcelProperty(value = "楼栋号/楼栋名称", index = 3)
    @ExcelProperty(value = "楼栋号", index = 3)
    private String name;
//    @ExcelProperty(value = "单元数", index = 6)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java
@@ -97,4 +97,7 @@
    @ApiModelProperty("养老金人员")
    private Integer pensionTotal;
    @ApiModelProperty("楼栋数")
    private Integer buildNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
New file
@@ -0,0 +1,68 @@
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: ComPropertyPublicityVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传信息
 * @author: hans
 * @date: 2021/11/11 10:15
 */
@Data
@ApiModel("物业宣传信息")
public class ComPropertyPublicityVO {
    @ApiModelProperty("物业宣传id")
    private Long id;
    @ApiModelProperty("宣传标题")
    private String title;
    @ApiModelProperty("宣传类型(0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主)")
    private Integer publicityType;
    @ApiModelProperty("其他类型自定义名称")
    private String other;
    @ApiModelProperty("封面")
    private String cover;
    @ApiModelProperty("内容形式(1.文章链接 2.自定义内容)")
    private Integer contentType;
    @ApiModelProperty("文章链接")
    private String articleUrl;
    @ApiModelProperty("自定义内容")
    private String diyContent;
    @ApiModelProperty("物业公司id")
    private Long propertyId;
    @ApiModelProperty("物业公司名称")
    private String propertyName;
    @ApiModelProperty("所属小区")
    private String villageName;
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("浏览量")
    private Integer viewNum;
    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @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/ComSwPatrolRecordVO.java
@@ -221,6 +221,12 @@
    @ApiModelProperty("隐患or安全记录(1.隐患 2.安全记录)")
    private Integer dangerOrRecord;
    @ApiModelProperty("社区名字")
    private String communityName;
    @ApiModelProperty("隐患编号")
    private Integer dagerNo;
    /**
     * 巡查类型
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: MyActivityEvaluateVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 我的评价vo
 * @author: hans
 * @date: 2021/10/21 17:14
 */
@Data
@ApiModel("我的评价vo")
public class MyActivityEvaluateVO {
    @ApiModelProperty("是否展示评价按钮(1.展示 0.不展示)")
    private Integer isDisplay;
    @ApiModelProperty("评论详情")
    private List<ComActActEvaluateVO> myEvaluateList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    private Integer id;
    @ApiModelProperty("二维码类型 1居民,志愿者 2党员")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    private Long codeId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
@@ -29,5 +29,7 @@
    private Long activityId;
    @ApiModelProperty(value = "当前登录用户id", hidden = true)
    private Long userId;
    @ApiModelProperty("取消原因")
    private String reason;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.community;
import java.math.BigDecimal;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: StatisticsCommVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description:
 * @author: hans
 * @date: 2021/12/06 10:51
 */
@Data
@ApiModel("统计通用信息")
public class StatisticsCommVO {
    @ApiModelProperty(value = "统计日期")
    private String statisticsDate;
    @ApiModelProperty(value = "统计项")
    private String filed;
    @ApiModelProperty(value = "数量")
    private Integer num;
    @ApiModelProperty("统计项占比")
    private BigDecimal percent;
    @ApiModelProperty("统计数据列表")
    private List<StatisticsCommVO> statisticsCommVOS;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("基础数据")
public class BaseInfo {
    @ApiModelProperty("人口数")
    private Integer population;
    @ApiModelProperty("注册用户量")
    private Integer user;
    @ApiModelProperty("入住小区")
    private Integer village;
    @ApiModelProperty("实有房屋")
    private Integer house;
    @ApiModelProperty("实有单位")
    private Integer company;
    @ApiModelProperty("党员数")
    private Integer partyMember;
    @ApiModelProperty("志愿者")
    private Integer volunteer;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("大屏党建活动折线图")
public class BigScreenActivityLine {
    @ApiModelProperty("月份")
    private String x;
    @ApiModelProperty("新增数")
    private Integer y;
    @ApiModelProperty("累计数")
    private Integer countY;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java
New file
@@ -0,0 +1,21 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("党员积分排名")
public class BigScreenActivityTop {
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("党组织名")
    private String orgName;
    @ApiModelProperty("党员分数")
    private Integer score;
    @ApiModelProperty("头像")
    private String url;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java
New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenCommunityStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏社区服务统计信息
 * @author: hans
 * @date: 2021/12/10 13:16
 */
@Data
@ApiModel("大屏社区服务统计信息")
public class BigScreenCommunityStatisticsVO {
    @ApiModelProperty("大屏网格数据")
    private List<EventGridStatisticsVO> gridStatisticsList;
    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;
    @ApiModelProperty("商家地图点位数据")
    private List<ConvenientMerchantVO> merchantMapDataList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java
New file
@@ -0,0 +1,33 @@
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: BigScreenDynStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区动态大屏统计数据
 * @author: hans
 * @date: 2021/12/17 10:19
 */
@Data
@ApiModel("社区动态大屏统计数据")
public class BigScreenDynStatisticsInfo {
    @ApiModelProperty("社区动态总数")
    private Integer dynNum = 0;
    @ApiModelProperty(value = "社区动态饼图数据")
    private List<StatisticsCommVO> dynCircleData;
    @ApiModelProperty(value = "社区动态新增折线数据")
    private List<StatisticsCommVO> dynAddPolylineData;
    @ApiModelProperty(value = "社区动态累计折线数据")
    private List<StatisticsCommVO> dynTotalPolylineData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java
New file
@@ -0,0 +1,51 @@
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 BigScreenEasyPhotoStatisticsInfo {
    @ApiModelProperty("随手拍累计解决数量")
    private Integer eventDealTotal = 0;
    @ApiModelProperty("突发事件报告解决数")
    private Integer eventTFDeal = 0;
    @ApiModelProperty("治安防控事件解决数")
    private Integer eventZADeal = 0;
    @ApiModelProperty("矛盾劝解事件解决数")
    private Integer eventMDDeal = 0;
    @ApiModelProperty("特殊人群服务事件解决数")
    private Integer eventTSDeal = 0;
    @ApiModelProperty("民生服务事件解决数")
    private Integer eventMSDeal = 0;
    @ApiModelProperty("防灾减灾事件解决数")
    private Integer eventFJDeal = 0;
    @ApiModelProperty("其他事件解决数")
    private Integer otherDeal = 0;
    @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/BigScreenGridStaticsReturn.java
New file
@@ -0,0 +1,18 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
 * @author zzj
 */
@Data
public class BigScreenGridStaticsReturn {
    private Integer count;
    private Integer num;
    private BigDecimal percent;
    private String title;
    private List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java
New file
@@ -0,0 +1,45 @@
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: BigScreenMerchantStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民商家大屏统计数据
 * @author: hans
 * @date: 2021/12/17 15:05
 */
@Data
@ApiModel("便民商家大屏统计数据")
public class BigScreenMerchantStatisticsInfo {
    @ApiModelProperty("资源类型数")
    private Integer resourceTypeNum = 0;
    @ApiModelProperty("服务类型数")
    private Integer serviceTypeNum = 0;
    @ApiModelProperty("商家数量")
    private Integer merchantNum = 0;
    @ApiModelProperty("已提供服务次数")
    private Integer serviceTimes = 0;
    @ApiModelProperty(value = "资源类型饼图数据")
    private List<StatisticsCommVO> resourceTypeCircleData;
    @ApiModelProperty(value = "服务类型饼图数据")
    private List<StatisticsCommVO> serviceTypeCircleData;
    @ApiModelProperty(value = "服务量新增折线数据")
    private List<StatisticsCommVO> serviceTimesAddPolylineData;
    @ApiModelProperty(value = "服务量累计折线数据")
    private List<StatisticsCommVO> serviceTimesTotalPolylineData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenMicroWishStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 微心愿大屏统计数据
 * @author: hans
 * @date: 2021/12/15 16:56
 */
@Data
@ApiModel("微心愿大屏统计数据")
public class BigScreenMicroWishStatisticsInfo {
    @ApiModelProperty("心愿总数量")
    private Integer microWishTotal;
    @ApiModelProperty("心愿已实现数量")
    private Integer microWishRealized;
    @ApiModelProperty("心愿未实现数量")
    private Integer microWishUnrealized;
    @ApiModelProperty(value = "微心愿新增折线数据")
    private List<StatisticsCommVO> microWishAddPolylineData;
    @ApiModelProperty(value = "微心愿累计折线数据")
    private List<StatisticsCommVO> microWishTotalPolylineData;
    @ApiModelProperty(value = "微心愿展示列表")
    private List<ComActMicroWishVO> microWishDisplayList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java
New file
@@ -0,0 +1,36 @@
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: BigScreenNeighborStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 邻里圈大屏统计数据
 * @author: hans
 * @date: 2021/12/17 13:19
 */
@Data
@ApiModel("邻里圈大屏统计数据")
public class BigScreenNeighborStatisticsInfo {
    @ApiModelProperty("邻里圈发布内容数")
    private Integer publishContentNum = 0;
    @ApiModelProperty("邻里圈发布话题数")
    private Integer publishTopicNum = 0;
    @ApiModelProperty(value = "邻里圈饼图数据")
    private List<StatisticsCommVO> neighborCircleData;
    @ApiModelProperty(value = "邻里圈新增折线数据")
    private List<StatisticsCommVO> neighborAddPolylineData;
    @ApiModelProperty(value = "邻里圈累计折线数据")
    private List<StatisticsCommVO> neighborTotalPolylineData;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.util.List;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: BigScreenQuestionnaireStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区问卷大屏统计数据
 * @author: hans
 * @date: 2021/12/16 16:11
 */
@Data
@ApiModel("社区问卷大屏统计数据")
public class BigScreenQuestionnaireStatisticsInfo {
    @ApiModelProperty("社区问卷发起总数")
    private Integer questionnaireNum = 0;
    @ApiModelProperty("社区问卷参与人数")
    private Integer joinNum = 0;
    @ApiModelProperty(value = "社区问卷新增折线数据")
    private List<StatisticsCommVO> questionnaireAddPolylineData;
    @ApiModelProperty(value = "社区问卷累计折线数据")
    private List<StatisticsCommVO> questionnaireTotalPolylineData;
    @ApiModelProperty(value = "社区问卷展示列表")
    private List<ComActQuestnaireVO> questionnaireDisplayList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java
New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("服务数据")
public class BigScreenServiceData {
    @ApiModelProperty("办事指南")
    private Integer guide;
    @ApiModelProperty("通知公告")
    private Integer announcement;
    @ApiModelProperty("高龄认证")
    private Integer eldersAuth;
    @ApiModelProperty("便民商家")
    private Integer convenient;
    @ApiModelProperty("房屋租赁")
    private Integer rentingHouse;
    @ApiModelProperty("一键服务")
    private Integer oneButton;
    @ApiModelProperty("社区工作者")
    private Integer socialWorker = 0;
    @ApiModelProperty("养老认证")
    private Integer pensionAuth;
    @ApiModelProperty("逝世申报")
    private Integer death=0;
    @ApiModelProperty("高龄补贴")
    private Integer eldersAllowance=0;
    @ApiModelProperty("服务咨询")
    private Integer serviceConsultation=0;
    @ApiModelProperty("政策文件")
    private Integer partyDyn;
    @ApiModelProperty("便民设施")
    private Integer equipment=0;
    @ApiModelProperty("物业公司")
    private Integer property;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java
New file
@@ -0,0 +1,17 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("服务居民")
public class BigScreenServiceUser {
    @ApiModelProperty("小区名")
    private String villageName;
    @ApiModelProperty("人数")
    private Integer num;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java
New file
@@ -0,0 +1,38 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
 * @author zzj
 */
@Data
@ApiModel("安全防控")
public class BigScreenStaticsReserve {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("防疫管控")
    private Integer epidemicCount;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("返攀登记百分比")
    private BigDecimal reservePercent;
    @ApiModelProperty("居家隔离百分比")
    private BigDecimal homePercent;
    @ApiModelProperty("燃气登记百分比")
    private BigDecimal gasPercent;
    @ApiModelProperty("防火登记百分比")
    private BigDecimal firePercent;
    @ApiModelProperty("折线图数据")
    private List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("每月安全防空数据")
public class BigScreenStaticsReserveMonth {
    @ApiModelProperty("x轴")
    private String x;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("总量")
    private Integer count;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java
@@ -21,5 +21,10 @@
    private Integer activityCount;
    @ApiModelProperty(value = "党建宣传数")
    private Integer dynCount;// 党建动态
    @ApiModelProperty(value = "社区党委")
    private Integer committeeCount;
    @ApiModelProperty("覆盖率")
    private Integer coverPercent=0;
    @ApiModelProperty("单位党组织")
    private Integer orgPartyCount=0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
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.screen.ScreenDrawEventPopulationTotalVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @title: GridsGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 清网治格统计信息
 * @author: hans
 * @date: 2021/12/08 14:38
 */
@Data
@ApiModel("清网治格统计信息")
public class BigscreenGridsGovernanceStatisticsVO {
    @ApiModelProperty("事件总数")
    private Integer eventTotal = 0;
    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;
    @ApiModelProperty("治安防控事件总数")
    private Integer eventZATotal = 0;
    @ApiModelProperty("矛盾劝解事件总数")
    private Integer eventMDTotal = 0;
    @ApiModelProperty("特殊人群服务事件总数")
    private Integer eventTSTotal = 0;
    @ApiModelProperty("民生服务事件总数")
    private Integer eventMSTotal = 0;
    @ApiModelProperty("防灾减灾事件总数")
    private Integer eventFJTotal = 0;
    @ApiModelProperty("法规宣传事件总数")
    private Integer eventFGTotal = 0;
    @ApiModelProperty("安全巡查")
    private Integer safety=0;
    @ApiModelProperty("其他事件总数")
    private Integer otherTotal = 0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
New file
@@ -0,0 +1,113 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
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.screen.ScreenDrawEventPopulationTotalVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @title: GridsGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 清网治格统计信息
 * @author: hans
 * @date: 2021/12/08 14:38
 */
@Data
@ApiModel("清网治格统计信息")
public class GridsGovernanceStatisticsVO {
    @ApiModelProperty("事件总数")
    private Integer eventTotal = 0;
    @ApiModelProperty("已处理事件总数")
    private Integer dealTotal = 0;
    @ApiModelProperty("待处理事件总数")
    private Integer unDealTotal = 0;
    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;
    @ApiModelProperty("治安防控事件总数")
    private Integer eventZATotal = 0;
    @ApiModelProperty("矛盾劝解事件总数")
    private Integer eventMDTotal = 0;
    @ApiModelProperty("特殊人群服务事件总数")
    private Integer eventTSTotal = 0;
    @ApiModelProperty("民生服务事件总数")
    private Integer eventMSTotal = 0;
    @ApiModelProperty("防灾减灾事件总数")
    private Integer eventFJTotal = 0;
    @ApiModelProperty("其他事件总数")
    private Integer otherTotal = 0;
    @ApiModelProperty("突发事件报告完成数")
    private Integer eventTFDeal = 0;
    @ApiModelProperty("治安防控事件完成数")
    private Integer eventZADeal = 0;
    @ApiModelProperty("矛盾劝解事件完成数")
    private Integer eventMDDeal = 0;
    @ApiModelProperty("特殊人群服务事件完成数")
    private Integer eventTSDeal = 0;
    @ApiModelProperty("民生服务事件完成数")
    private Integer eventMSDeal = 0;
    @ApiModelProperty("防灾减灾事件完成数")
    private Integer eventFJDeal = 0;
    @ApiModelProperty("其他事件完成数")
    private Integer otherDeal = 0;
    @ApiModelProperty("网格数")
    private Integer gridTotal = 0;
    @ApiModelProperty("调解员")
    private Integer gridMemberTotal = 0;
    @ApiModelProperty("大屏网格数据")
    private List<EventGridStatisticsVO> gridStatisticsList;
    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;
    @ApiModelProperty("社区事件数据")
    private List<EventGridIncidentStatisticsVO> gridIncidentList;
    @ApiModelProperty("人口统计")
    private ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO;
    @ApiModelProperty("年龄段统计")
    private List<StatisticsCommVO> ageGroupStatistics;
    @ApiModelProperty("事件分析新增折线数据")
    private List<StatisticsCommVO> eventAddPolylineData;
    @ApiModelProperty("事件分析累计折线数据")
    private List<StatisticsCommVO> eventTotalPolylineData;
    @ApiModelProperty("绘制事件类型统计圆形图")
    private List<StatisticsCommVO> eventTypeCircleDrawData;
    public void generateStatisticsData() {
        this.eventTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
                this.eventTSTotal + this.eventMSTotal + this.eventFJTotal + this.otherTotal;
        this.dealTotal = this.eventTFDeal + this.eventZADeal + this.eventMDDeal +
                this.eventTSDeal + this.eventMSDeal + this.eventFJDeal + this.otherDeal;
        this.unDealTotal = this.eventTotal - this.dealTotal;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记数据")
public class IndexBackReserve {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("标题数量")
    private List<IndexReserveSub> indexReserveSubList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java
New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("首页业务模块统计")
public class IndexDynamic {
    @ApiModelProperty("微心愿")
    private Integer microWish;
    @ApiModelProperty("随手拍")
    private Integer easyPhoto;
    @ApiModelProperty("居民活动")
    private Integer residentActivity=0;
    @ApiModelProperty("志愿服务")
    private Integer volunteerActivity=0;
    @ApiModelProperty("党员活动")
    private Integer partyActivity;
    @ApiModelProperty("社区问卷")
    private Integer questionnaire;
    @ApiModelProperty("社区动态")
    private Integer dynamic;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
    @ApiModelProperty("便民商家")
    private Integer convenient;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @author zzj
 */
@Data
@ApiModel("居家隔离数据")
public class IndexHomeQuarantine {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("标题数量")
    private List<IndexReserveSub> indexReserveSubList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java
New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import com.panzhihua.common.model.vos.community.screen.index.IndexEventGridStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @author zzj
 */
@Data
@ApiModel("大屏首页返回数据")
public class IndexInfo {
    @ApiModelProperty("基础数据")
    private BaseInfo baseInfo;
    @ApiModelProperty("实有人口数据")
    private IndexPopulationStatisticsVO indexPopulationStatisticsVO;
    @ApiModelProperty("特殊人群统计模块数据")
    private List<IndexSpecialStatisticsVO> specialStatisticsVOList;
    @ApiModelProperty("网格化治理模块数据")
    private IndexEventGridStatisticsVO eventGridStatisticsVO;
    @ApiModelProperty("返攀登记居家隔离数据统计")
    private IndexReserve indexReserve;
    @ApiModelProperty("业务统计")
    private IndexDynamic indexDynamic;
    @ApiModelProperty("杨戬要求修改")
    private BigScreenGridStaticsReturn bigScreenGridStaticsReturn;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java
New file
@@ -0,0 +1,17 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记居家隔离数据")
public class IndexReserve {
    @ApiModelProperty("返攀登记数据")
    private IndexBackReserve indexBackReserve;
    @ApiModelProperty("居家隔离数据")
    private IndexHomeQuarantine indexHomeQuarantine;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记居家隔离数据标题数量")
public class IndexReserveSub {
    @ApiModelProperty("标题值")
    private Integer key;
    @ApiModelProperty("数量")
    private Integer num;
    @ApiModelProperty("总数")
    private Integer allCount;
    @ApiModelProperty("占比")
    private BigDecimal percent;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java
New file
@@ -0,0 +1,129 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import java.math.BigDecimal;
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: ResidentAutonomyStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 居民自治统计信息
 * @author: hans
 * @date: 2021/12/06 14:27
 */
@Data
@ApiModel("居民自治统计信息")
public class ResidentAutonomyStatisticsVO {
    @ApiModelProperty(value = "随手拍本月总数")
    private Integer easyPhotoCurrentMonCount;
    @ApiModelProperty(value = "随手拍总数")
    private Integer easyPhotoTotalCount;
    @ApiModelProperty(value = "随手拍分类柱状统计")
    private List<StatisticsCommVO> easyPhotoHistogram;
    @ApiModelProperty(value = "微心愿本月总数")
    private Integer microWishCurrentMonCount;
    @ApiModelProperty(value = "集心池")
    private Integer aimNum;
    @ApiModelProperty(value = "微心愿总数")
    private Integer microWishTotal;
    @ApiModelProperty(value = "微心愿待实现&已实现数目及占比")
    private List<StatisticsCommVO> microWishRealizePercent;
    @ApiModelProperty(value = "微心愿图片")
    private List<String> microWishImages;
    @ApiModelProperty(value = "业主委员会本月总数")
    private Integer committeeCurrentMonCount;
    @ApiModelProperty(value = "业主委员会总数")
    private Integer committeeTotal;
    @ApiModelProperty(value = "业主委员会小区覆盖率")
    private BigDecimal areaCoverPercent;
    @ApiModelProperty(value = "议事投票本月总数")
    private Integer discussCurrentMonCount;
    @ApiModelProperty(value = "议事投票总数")
    private Integer discussTotal;
    @ApiModelProperty(value = "议事参与人总数")
    private Integer discussCount;
    @ApiModelProperty(value = "投票参与人总数")
    private Integer voteCount;
    @ApiModelProperty(value = "议事标题")
    private List<String> discussTitles;
    @ApiModelProperty(value = "投票标题")
    private List<String> voteTitles;
    @ApiModelProperty(value = "议事投票类型占比")
    private List<StatisticsCommVO> discussTypePercent;
    @ApiModelProperty(value = "邻里圈本月总数")
    private Integer neighborCurrentMonCount;
    @ApiModelProperty(value = "邻里圈总数")
    private Integer neighborTotal;
    @ApiModelProperty(value = "邻里圈点赞量")
    private Integer neighborFabulousNum;
    @ApiModelProperty(value = "邻里圈分享量")
    private Integer neighborForwardNum;
    @ApiModelProperty(value = "邻里圈评论量")
    private Integer neighborCommentNum;
    @ApiModelProperty(value = "邻里圈图片")
    private List<String> neighborImages;
    @ApiModelProperty(value = "邻里圈文本内容")
    private List<String> neighborContents;
    @ApiModelProperty(value = "报事报修本月总数")
    private Integer repairCurrentMonCount;
    @ApiModelProperty(value = "报事报修总数")
    private Integer repairTotal;
    @ApiModelProperty(value = "报事报修新增折线数据")
    private List<StatisticsCommVO> repairAddPolylineData;
    @ApiModelProperty(value = "报事报修累计折线数据")
    private List<StatisticsCommVO> repairTotalPolylineData;
    @ApiModelProperty(value = "爱心义仓本月总数")
    private Integer warehouseCurrentMonCount;
    @ApiModelProperty(value = "爱心义仓总捐赠数")
    private Integer warehouseTotal;
    @ApiModelProperty(value = "爱心义仓剩余物品数")
    private Integer warehouseSurplusTotal;
    @ApiModelProperty(value = "爱心义仓已领取物品数")
    private Integer warehouseApplyTotal;
    @ApiModelProperty(value = "爱心义仓捐赠记录")
    private List<String> warehouseDonateRecords;
    @ApiModelProperty(value = "爱心义仓爱心传递")
    private List<String> warehouseLoveTransfer;
    @ApiModelProperty(value = "爱心义仓捐赠物品图片")
    private List<String> warehouseImages;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community.bigscreen;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel("西区大屏治理数据")
public class WestScreenStatics {
    @ApiModelProperty("注册人数")
    private Integer user;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("党员")
    private Integer partyMember;
    @ApiModelProperty("志愿者")
    private Integer volunteer;
    @ApiModelProperty("微心愿")
    private Integer microWish;
    @ApiModelProperty("安全巡查")
    private Integer safety;
    @ApiModelProperty("社区活动")
    private Integer activity;
    @ApiModelProperty("疫情防控")
    private Integer reserve;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
    @ApiModelProperty("一起议")
    private Integer discuss;
    @ApiModelProperty("日活跃")
    private Integer dayUser;
    @ApiModelProperty("累计用户")
    private Integer countUser;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java
New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.vos.community.easyPhoto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class BannerVO {
    private Long id;
    @ApiModelProperty("1社区动态、2居民活动、志愿者活动、3党员活动、4问卷调查、5党建动态、6预约登记、7随手拍活动")
    private Integer type;
    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date showTime;
    @ApiModelProperty("图片路径")
    private String cover;
    @ApiModelProperty("跳转地址")
    private String jumpUrl;
    @ApiModelProperty("跳转类型")
    private String jumpType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java
@@ -12,7 +12,7 @@
@ApiModel("小程序-用户社区积分明细返回参数")
public class ComActIntegralCommunityTradeVO {
    @ApiModelProperty("交易业务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)")
    @ApiModelProperty("交易业务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)8活动签到")
    private Integer serviceType;
    @ApiModelProperty("交易数量")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java
New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * @author zzj
 */
@Data
@ApiModel
public class OrderStatics {
    @ApiModelProperty("总订单金额")
    private BigDecimal allOrder;
    @ApiModelProperty("租金总金额")
    private BigDecimal allRent;
    @ApiModelProperty("服务费总金额")
    private BigDecimal allService;
    @ApiModelProperty("保证金总金额")
    private BigDecimal allBond;
    @ApiModelProperty("服务费收益")
    private BigDecimal serviceProfit;
    @ApiModelProperty("保证金余额")
    private BigDecimal bondProfit;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel
public class PayOrderVO {
    @ApiModelProperty("订单支付类型 1.定金订单 2.退款订单 3.普通订单")
    private Integer type;
    private String orderNo;
    /**
     * 订单支付类型  1.定金订单 2.退款订单 3.普通订单
     */
    public interface type{
        int dj=1;
        int tk=2;
        int pt=3;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
 * @author zzj
 */
@Data
@ApiModel
public class PreOrderStatics {
    @ApiModelProperty("总定金金额")
    private BigDecimal allOrder;
    @ApiModelProperty("定金退款总额")
    private BigDecimal allRefuse;
    @ApiModelProperty("退款数")
    private BigDecimal refuseNum;
    @ApiModelProperty("已结算定金")
    private BigDecimal settledOrder;
    @ApiModelProperty("待抵扣定金")
    private BigDecimal deductOrder;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java
New file
@@ -0,0 +1,252 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class RentingHourseOrderVO {
    private Long id;
    /**
     * 街道ID
     */
    @ApiModelProperty(value = "街道ID")
    private Long streetId;
    /**
     * 小区id
     */
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 小区名称
     */
    @ApiModelProperty(value = "小区名称")
    private String villageName;
    /**
     * 订单类型(1、新订单2、续租订单)
     */
    @ApiModelProperty(value = "订单类型(1、新订单2、续租订单)")
    private Integer orderType;
    /**
     * 续租订单的原订单号
     */
    @ApiModelProperty(value = "续租订单的原订单号")
    private String originOrderSn;
    /**
     * 订单SN号
     */
    @ApiModelProperty(value = "订单SN号")
    private String orderSn;
    /**
     * 交易流水号
     */
    @ApiModelProperty(value = "交易流水号")
    private String paySn;
    /**
     * 租赁月数(多少个月)
     */
    @ApiModelProperty(value = "租赁月数(多少个月)")
    private Integer rentingMonth;
    /**
     * 建筑面积
     */
    @ApiModelProperty(value = "建筑面积")
    private String constructArea;
    /**
     * 房型
     */
    @ApiModelProperty(value = "房型")
    private String roomType;
    /**
     * 月租金
     */
    @ApiModelProperty(value = "月租金")
    private BigDecimal monthlyRentMoney;
    /**
     * 保证金
     */
    @ApiModelProperty(value = "保证金")
    private BigDecimal depositAmount;
    /**
     * 服务费
     */
    @ApiModelProperty(value = "服务费")
    private BigDecimal serverCharge;
    /**
     * 定金
     */
    @ApiModelProperty(value = "定金")
    private BigDecimal dingAmount;
    /**
     * 支付定金的订单号
     */
    @ApiModelProperty(value = "支付定金的订单号")
    private String preOrderSn;
    /**
     * 支付的定金的订单备注
     */
    @ApiModelProperty(value = "支付的定金的订单备注")
    private String preOrderNote;
    /**
     * 订单是否已经平台结算
     */
    @ApiModelProperty(value = "订单是否已经平台结算")
    private String settingFlag;
    /**
     * 结算金额
     */
    @ApiModelProperty(value = "结算金额")
    private BigDecimal settingAmount;
    /**
     * 计算订单号
     */
    @ApiModelProperty(value = "计算订单号")
    private String settingSn;
    /**
     * 平台结算时间
     */
    @ApiModelProperty(value = "平台结算时间")
    private Date settingDate;
    /**
     * 总楼层
     */
    @ApiModelProperty(value = "总楼层")
    private String totalFloor;
    /**
     * 朝向
     */
    @ApiModelProperty(value = "朝向")
    private String orientation;
    /**
     * 装饰
     */
    @ApiModelProperty(value = "装饰")
    private String decoration;
    /**
     * 房内物品
     */
    @ApiModelProperty(value = "房内物品")
    private String hourseItem;
    /**
     * 房主姓名
     */
    @ApiModelProperty(value = "房主姓名")
    private String hourseOwnerName;
    /**
     * 房主身份证
     */
    @ApiModelProperty(value = "房主身份证")
    private String hourseIdCard;
    /**
     * 房主电话
     */
    @ApiModelProperty(value = "房主电话")
    private String hoursePhone;
    /**
     * 租客的用户ID,微信用户类型
     */
    @ApiModelProperty(value = "租客的用户ID,微信用户类型")
    private Long rentingUserId;
    /**
     * 租赁开始时间
     */
    @ApiModelProperty(value = "租赁开始时间")
    private Date startDate;
    /**
     * 租赁结束时间
     */
    @ApiModelProperty(value = "租赁结束时间")
    private Date endDate;
    /**
     * 合同内容
     */
    @ApiModelProperty(value = "合同内容")
    private String contractText;
    /**
     * 已支付定金金额(已经下定金的金额)
     */
    @ApiModelProperty(value = "已支付定金金额(已经下定金的金额)")
    private BigDecimal payedDingMoney;
    /**
     * 订单最终金额
     */
    @ApiModelProperty(value = "订单最终金额")
    private BigDecimal totalAccount;
    /**
     * 1、订单未支付2、订单已支付3、待房东签约4、房东已签约,合同生效5、已退款
     */
    @ApiModelProperty(value = "1、订单未支付2、订单已支付3、待房东签约4、房东已签约,合同生效5、已退款")
    private Integer status;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 房屋登记ID
     */
    @ApiModelProperty(value = "房屋登记ID")
    private Long registerId;
    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String url;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java
New file
@@ -0,0 +1,102 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class RentingHoursePreOrderVO {
    private Long id;
    /**
     * 订单SN号
     */
    @ApiModelProperty(value = "订单SN号")
    private String orderSn;
    /**
     * 房屋登记ID
     */
    @ApiModelProperty(value = "房屋登记ID")
    private Long registerId;
    /**
     * 定金
     */
    @ApiModelProperty(value = "定金")
    private BigDecimal dingMoney;
    /**
     * 合同内容
     */
    @ApiModelProperty(value = "合同内容")
    private String contractText;
    /**
     * 1 已缴纳定金,待抵扣 2、合同已签订,定金已抵扣 3、房东未按时处理,定金已退款  2、已退还定金 3、未按时去和房东签约订单过期,定金不退,已失效
     */
    @ApiModelProperty(value = "1 已缴纳定金,待抵扣 2、合同已签订,定金已抵扣 3、房东未按时处理,定金已退款  2、已退还定金 3、未按时去和房东签约订单过期,定金不退,已失效")
    private Integer status;
    /**
     * 定金保留时间
     */
    @ApiModelProperty(value = "定金保留时间")
    private Date expireDate;
    /**
     * 房东扫描的时候绑定微信APPID
     */
    @ApiModelProperty(value = "房东扫描的时候绑定微信APPID")
    private String hourseOwnerWeixinAppid;
    /**
     * 房东的用户ID,用户表记录了房东的详细信息
     */
    @ApiModelProperty(value = "房东的用户ID,用户表记录了房东的详细信息")
    private Long hourseOwnerUserId;
    /**
     * 租客的微信APPID
     */
    @ApiModelProperty(value = "租客的微信APPID")
    private String tenantWeixinAppid;
    /**
     * 租客的用户ID,房东的用户ID,用户表记录了租客的详细信息
     */
    @ApiModelProperty(value = "租客的用户ID,房东的用户ID,用户表记录了租客的详细信息")
    private Long tenantUserId;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    @ApiModelProperty(value = "流水号")
    private String paySn;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    @ApiModelProperty(value = "房屋名称")
    private String villageName;
    @ApiModelProperty(value = "图片")
    private String url;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class WxPayNotifyOrderVO {
    @ApiModelProperty("订单号")
    private String orderSn;
    /**
     * 支付类型
     */
    @ApiModelProperty(value = "支付类型")
    private String payType;
    /**
     * 支付时间
     */
    @ApiModelProperty(value = "支付时间")
    private Date payDate;
    /**
     * 支付金额
     */
    @ApiModelProperty(value = "支付金额")
    private BigDecimal payAmount;
    /**
     * 支付返回内容
     */
    @ApiModelProperty(value = "支付返回内容")
    private String payReturnText;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java
New file
@@ -0,0 +1,17 @@
package com.panzhihua.common.model.vos.community.rentHouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel
public class WxPayOrderVO {
    @ApiModelProperty("订单号")
    private String orderSn;
    @ApiModelProperty("openId")
    private String openId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java
New file
@@ -0,0 +1,157 @@
package com.panzhihua.common.model.vos.community.rentingHouses;
import java.math.BigDecimal;
import java.util.List;
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 javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
/**
 * @title: RentingHousesConfigVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁配置信息
 * @author: hans
 * @date: 2021/11/23 14:13
 */
@Data
@ApiModel("房屋租赁配置信息")
public class RentingHouseRegisterVO {
    @ApiModelProperty(value = "id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    @ApiModelProperty(value = "楼层号")
    private String floor;
    @ApiModelProperty(value = "总楼层")
    private String totalFloor;
    @ApiModelProperty(value = "房屋地址")
    private String address;
    @ApiModelProperty(value = "认证状态(1、未认证2、已认证)")
    private Integer authStatus;
    @ApiModelProperty(value = "认证码")
    private String authCode;
    @ApiModelProperty(value = "房屋状态(1、待发布 2、已发布,待出租2、出租中3、已退租")
    private Integer status;
    @ApiModelProperty(value = "1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期)")
    private Integer detailStatus;
    @ApiModelProperty(value = "建筑面积")
    private BigDecimal constructArea;
    @ApiModelProperty(value = "租房标题")
    private String title;
    @ApiModelProperty(value = "室数量")
    private Integer brn;
    @ApiModelProperty(value = "厅数量")
    private Integer lrn;
    @ApiModelProperty(value = "卫数量")
    private Integer wcn;
    @ApiModelProperty(value = "月租金")
    private BigDecimal monthlyRentMoney;
    @ApiModelProperty(value = "朝向(1东2南3西4北5东南6东北7西南8西北9南北10东西)")
    private Integer orientation;
    @ApiModelProperty(value = "装修情况(1.毛坯房 2.简装 3.精装修)")
    private Integer decoration;
    @ApiModelProperty(value = "房屋标签")
    private String label;
    @ApiModelProperty(value = "看房时间(1.随时看房 2.提前预约)")
    private Integer seeHourseDate;
    @ApiModelProperty(value = "房屋介绍")
    private String hourseDescription;
    @ApiModelProperty(value = "入住要求")
    private String checkInRequirement;
    @ApiModelProperty(value = "房内物品")
    private String hourseItem;
    @ApiModelProperty(value = "房主姓名")
    private String hourseOwnerName;
    @ApiModelProperty(value = "房主身份证")
    private String hourseIdCard;
    @ApiModelProperty(value = "房主电话")
    private String hoursePhone;
    @ApiModelProperty(value = "保证金")
    private BigDecimal depositMoney;
    @ApiModelProperty(value = "服务费")
    private BigDecimal serverCharge;
    @ApiModelProperty(value = "定金")
    private BigDecimal dingMoney;
    @ApiModelProperty(value = "看房电话")
    private String seeHourseTelephone;
    @ApiModelProperty(value = "房源封面展示图片")
    private String url;
    @ApiModelProperty(value = "房源图片")
    private List<String> housePictures;
    @ApiModelProperty(value = "产权证明")
    private List<String> propertyPictures;
    @ApiModelProperty(value = "证件照片")
    private List<String> credentialsPictures;
    @ApiModelProperty(value = "房屋委托代理合同")
    private String houseAgencyContract;
    @ApiModelProperty(value = "小区名称")
    private String villageName;
    @ApiModelProperty(value = "街/路/巷")
    private String alley;
    @ApiModelProperty(value = "街/路/巷号")
    private String houseNum;
    @ApiModelProperty(value = "楼栋号")
    private String buildingNo;
    @ApiModelProperty(value = "单元号")
    private String unitNo;
    @ApiModelProperty(value = "户室(房间号)")
    private String houseNo;
    @ApiModelProperty(value = "房屋的经度")
    private String longitude;
    @ApiModelProperty(value = "房屋的纬度")
    private String latitude;
    @ApiModelProperty(value = "是否是房东(1.是 2.否)")
    private Integer isLandlord;
    @ApiModelProperty(value = "租客电话")
    private String tenantTelephone;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community.rentingHouses;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: RentingHousesConfigVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁配置信息
 * @author: hans
 * @date: 2021/11/23 14:13
 */
@Data
@ApiModel("房屋租赁配置信息")
public class RentingHousesConfigVO {
    @ApiModelProperty("id")
    private Long id;
    @ApiModelProperty("配置名称")
    private String name;
    @ApiModelProperty("配置项目")
    private String key;
    @ApiModelProperty("配置内容")
    private String value;
    @ApiModelProperty("上次修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date modifyDate;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java
@@ -55,4 +55,7 @@
    @ApiModelProperty("是否是首页应用(1.是 2.否)")
    private Integer adverPositionApplication;
    @ApiModelProperty("社区名称")
    private String communityName;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterExportVO.java
New file
@@ -0,0 +1,27 @@
package com.panzhihua.common.model.vos.community.reserve;
import java.util.List;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: HomeQuarantineRegisterExportVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 居家隔离统计导出信息
 * @author: hans
 * @date: 2021/11/18 14:54
 */
@Data
@ApiModel("居家隔离统计导出信息")
public class HomeQuarantineRegisterExportVO {
    @ApiModelProperty("题目列表")
    private List<ComActQuestnaireSubVO> subs;
    @ApiModelProperty("数据集")
    private List<List<Object>> dataList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java
New file
@@ -0,0 +1,46 @@
package com.panzhihua.common.model.vos.community.reserve;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: HomeQuarantineRegisterStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 居家隔离统计信息
 * @author: hans
 * @date: 2021/11/17 15:25
 */
@Data
@ApiModel("居家隔离统计信息")
public class HomeQuarantineRegisterStatisticsVO {
    @ApiModelProperty("记录id")
    private Long id;
    @ApiModelProperty("用户id")
    private Long userId;
    @ApiModelProperty("开始登记时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("用户昵称")
    private String nickName;
    @ApiModelProperty("题目")
    private String reserveSubContent;
    @ApiModelProperty("答案")
    private String answerContent;
    @ApiModelProperty("题目id")
    private Long reserveSubId;
    @ApiModelProperty("选项类型(0 单选  1 多选 2 输入框  3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传 12签名)")
    private Integer optionType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java
New file
@@ -0,0 +1,34 @@
package com.panzhihua.common.model.vos.community.screen.civil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("民生统计便民服务返回参数")
public class CivilConvenienceStatisticsVO {
    @ApiModelProperty("办事指南")
    private Integer guideNum;
    @ApiModelProperty("疫情防控")
    private Integer situationNum;
    @ApiModelProperty("房屋租赁")
    private Integer leaseNum;
    @ApiModelProperty("报事报修")
    private Integer repairNum;
    @ApiModelProperty("养老认证")
    private Integer pensionNum;
    @ApiModelProperty("高龄认证")
    private Integer eldersNum;
    @ApiModelProperty("低保认证")
    private Integer subsistenceNum;
    @ApiModelProperty("高龄补贴")
    private Integer allowanceNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java
New file
@@ -0,0 +1,34 @@
package com.panzhihua.common.model.vos.community.screen.civil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGovernmentStatisticsVO {
    @ApiModelProperty("通知公告")
    private Integer noticeNum;
    @ApiModelProperty("议事投票")
    private Integer discussNum;
    @ApiModelProperty("随手拍")
    private Integer easyNum;
    @ApiModelProperty("邻里圈")
    private Integer neighborNum;
    @ApiModelProperty("居民活动")
    private Integer activityNum;
    @ApiModelProperty("社区动态")
    private Integer dynNum;
    @ApiModelProperty("爱心义仓")
    private Integer loveNum;
    @ApiModelProperty("居民留言板")
    private Integer messageNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java
New file
@@ -0,0 +1,34 @@
package com.panzhihua.common.model.vos.community.screen.civil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGridStatisticsVO {
    @ApiModelProperty("今日突发事件")
    private Integer tfTodayNum;
    @ApiModelProperty("今日治安防控")
    private Integer zaTodayNum;
    @ApiModelProperty("今日民生服务")
    private Integer msTodayNum;
    @ApiModelProperty("今日矛盾劝解")
    private Integer mdTodayNum;
    @ApiModelProperty("今日特殊人群服务")
    private Integer tsTodayNum;
    @ApiModelProperty("累计事件")
    private Integer eventNum;
    @ApiModelProperty("电子巡查统计")
    private Integer xcNum;
    @ApiModelProperty("安全巡查")
    private Integer securityNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java
New file
@@ -0,0 +1,34 @@
package com.panzhihua.common.model.vos.community.screen.civil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("民生统计党建返回参数")
public class CivilPartyStatisticsVO {
    @ApiModelProperty("社区两委")
    private Integer committeeNum;
    @ApiModelProperty("党建动态")
    private Integer dynNum;
    @ApiModelProperty("党建活动")
    private Integer activityNum;
    @ApiModelProperty("微心愿")
    private Integer wishNum;
    @ApiModelProperty("双报道党员")
    private Integer partyNum;
    @ApiModelProperty("党组织")
    private Integer organizationNum;
    @ApiModelProperty("志愿者团队")
    private Integer volunteerNum;
    @ApiModelProperty("问卷调查")
    private Integer questionnaireNum;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
@@ -29,4 +29,16 @@
    @ApiModelProperty("环比上月增长率")
    private BigDecimal rate;
    @ApiModelProperty("党建引领数据")
    private CivilPartyStatisticsVO civilPartyStatisticsVO;
    @ApiModelProperty("社区治理数据")
    private CivilGovernmentStatisticsVO civilGovernmentStatisticsVO;
    @ApiModelProperty("网格管理数据")
    private CivilGridStatisticsVO civilGridStatisticsVO;
    @ApiModelProperty("便民服务数据")
    private CivilConvenienceStatisticsVO civilConvenienceStatisticsVO;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
@@ -3,9 +3,12 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("民生统计小区列表返回参数")
@@ -66,4 +69,7 @@
    @ApiModelProperty("其他人员")
    private Integer otherPeopleNum;
    @ApiModelProperty("特殊人群统计模块数据")
    private List<IndexSpecialStatisticsVO> specialStatisticsList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java
New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.vos.community.screen.event;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: hans
 * @date: 2021/12/14 9:16
 */
@Data
@ApiModel("西区大数据分析平台-综合治理信息")
public class EventComprehensiveGovernanceStatisticsVO {
    @ApiModelProperty("综合治理总数")
    private Integer governanceTotal = 0;
    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;
    @ApiModelProperty("治安防控总数")
    private Integer eventZATotal = 0;
    @ApiModelProperty("矛盾劝解总数")
    private Integer eventMDTotal = 0;
    @ApiModelProperty("特殊人群服务总数")
    private Integer eventTSTotal = 0;
    @ApiModelProperty("民生服务总数")
    private Integer eventMSTotal = 0;
    @ApiModelProperty("居民随手拍总数")
    private Integer eventSSPTotal = 0;
    public void generateGovernanceTotal() {
        this.governanceTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
                this.eventTSTotal + this.eventMSTotal + this.eventSSPTotal;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
@@ -7,6 +7,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel("大屏网格下事件统计返回参数")
public class EventGridIncidentStatisticsVO {
@@ -15,13 +17,29 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long eventId;
    @ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
//    旧版参照@ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
    /**
     * type不代表网格类型
     */
    @ApiModelProperty("事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他)")
    private Integer type;
    @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
    private Integer eventType;
    @ApiModelProperty("事件发生经纬度")
    private String latLng;
    @ApiModelProperty("处理状态")
    @ApiModelProperty("事件内容")
    private String content;
    @ApiModelProperty("事件封面")
    private String cover;
    @ApiModelProperty("处理状态(1.已处理 2.待处理)")
    private Integer status;
    @ApiModelProperty("事件创建时间")
    private Date createAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java
New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.community.screen.event;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实基础信息")
public class EventPopulationBasicsStatisticsVO {
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;
    @ApiModelProperty("小区数量")
    private Integer villageNum = 0;
    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java
New file
@@ -0,0 +1,60 @@
package com.panzhihua.common.model.vos.community.screen.event;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实特殊人群信息")
public class EventPopulationSpecialStatisticsVO {
    @ApiModelProperty("残疾人")
    private Integer cjTotal = 0;
    @ApiModelProperty("低保户")
    private Integer dbTotal = 0;
    @ApiModelProperty("高龄老人")
    private Integer glTotal = 0;
    @ApiModelProperty("特殊情况")
    private Integer tsTotal = 0;
    @ApiModelProperty("特扶家庭")
    private Integer tfTotal = 0;
    @ApiModelProperty("退役军人")
    private Integer tyTotal = 0;
    @ApiModelProperty(value = "吸毒人员",hidden = true)
    private Integer xdTotal = 0;
    @ApiModelProperty(value = "社区矫正人员",hidden = true)
    private Integer jzTotal = 0;
    @ApiModelProperty(value = "邪教人员",hidden = true)
    private Integer xjTotal = 0;
    @ApiModelProperty(value = "刑释人员",hidden = true)
    private Integer xsTotal = 0;
    @ApiModelProperty(value = "上访人员",hidden = true)
    private Integer sfTotal = 0;
    @ApiModelProperty(value = "重精人员",hidden = true)
    private Integer zjTotal = 0;
    @ApiModelProperty("老年人(》=60)")
    private Integer lnTotal = 0;
    @ApiModelProperty("其他")
    private Integer otherTotal = 0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.community.screen.event;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实信息")
public class EventPopulationStatisticsVO {
    @ApiModelProperty("人口数据")
    private List<EventPopulationBasicsStatisticsVO> basicsList;
    @ApiModelProperty("特殊人口数据")
    private EventPopulationSpecialStatisticsVO specialStatisticsVo;
    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;
    @ApiModelProperty("小区数量")
    private Integer villageNum = 0;
    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.screen.event;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-街道列表信息")
public class EventPopulationStreetVO {
    @ApiModelProperty("街道id")
    private Long streetId;
    @ApiModelProperty("街道名称")
    private String name;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java
@@ -4,26 +4,37 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel("大屏首页网格化治理事件数据统计返回参数")
public class IndexGridEventStatisticsVO {
    @ApiModelProperty("突发事件数量")
    private Integer eventTFTotal;
    @ApiModelProperty("突发事件占比")
    private BigDecimal tfPercent;
    @ApiModelProperty("治安隐患事件数量")
    private Integer eventZATotal;
    @ApiModelProperty("治安隐患事件占比")
    private BigDecimal zaPercent;
    @ApiModelProperty("矛盾纠纷事件数量")
    private Integer eventMDTotal;
    @ApiModelProperty("矛盾纠纷事件占比")
    private BigDecimal mdPercent;
    @ApiModelProperty("特殊人员上报数量")
    private Integer eventTSTotal;
    @ApiModelProperty("特殊人员上报占比")
    private BigDecimal tsPercent;
    @ApiModelProperty("不稳定因素事件数量")
    private Integer eventBWDTotal;
    @ApiModelProperty("不稳定因素事件占比")
    private BigDecimal bwdPercent;
    @ApiModelProperty("公共服务数量")
    private Integer eventGGTotal;
    @ApiModelProperty("公共服务占比")
    private BigDecimal ggPercent;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel("大屏首页实有人口年龄段数据统计返回参数")
public class IndexPopulationAgeStatisticsVO {
@@ -14,4 +16,7 @@
    @ApiModelProperty("数量")
    private Integer sum = 0;
    @ApiModelProperty("占比")
    private BigDecimal percent;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java
@@ -14,4 +14,7 @@
    @ApiModelProperty("数量")
    private Integer sum;
    @ApiModelProperty("占比")
    private Integer percent;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel("大屏首页特殊人群统计数据返回参数")
public class IndexSpecialStatisticsVO {
@@ -14,4 +16,7 @@
    @ApiModelProperty("人口数量")
    private Integer sum;
    @ApiModelProperty("占比")
    private BigDecimal percent;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java
@@ -14,6 +14,13 @@
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "社区名称")
    private String name;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "维度")
    private String lat;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -104,4 +104,7 @@
    @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/PartyBuildingComPbDynVO.java
@@ -82,6 +82,12 @@
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("跳转链接")
    private String jumpUrl;
    @ApiModelProperty("跳转状态")
    private Integer jumpType;
    @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
    private Integer policyType;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
@@ -53,4 +53,46 @@
    @ApiModelProperty("网格员")
    private Integer WGYTotal = 6;
    @ApiModelProperty("总户数")
    private Integer houseTotal = 0;
    @ApiModelProperty("残疾人")
    private Integer disabilityTotal = 0;
    @ApiModelProperty("低保户")
    private Integer lowSecurityTotal = 0;
    @ApiModelProperty("高龄老人")
    private Integer elderTotal = 0;
    @ApiModelProperty("特殊情况")
    private Integer specialSituationTotal = 0;
    @ApiModelProperty("其他")
    private Integer otherTotal = 0;
    @ApiModelProperty("特扶家庭")
    private Integer specialHelpTotal = 0;
    @ApiModelProperty("退役军人")
    private Integer veteransTotal = 0;
    @ApiModelProperty("老年人")
    private Integer oldTotal = 0;
    @ApiModelProperty("养老人员")
    private Integer pensionTotal = 0;
    @ApiModelProperty("出租房源")
    private Integer rentingHouseTotal = 0;
    @ApiModelProperty("社会工作者")
    private Integer socialWorkerTotal = 0;
    @ApiModelProperty("志愿者")
    private Integer volunteerTotal = 0;
    @ApiModelProperty("平均年龄")
    private Integer averageAge = 0;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -133,4 +133,13 @@
     */
    @PostMapping("/loginMerchantBackStage")
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -25,6 +26,7 @@
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -63,6 +65,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
@@ -104,6 +107,7 @@
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
@@ -124,6 +128,13 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
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;
@@ -165,6 +176,7 @@
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.*;
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;
@@ -183,6 +195,7 @@
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;
@@ -250,7 +263,10 @@
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
@@ -302,6 +318,7 @@
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -313,6 +330,10 @@
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -1066,10 +1087,11 @@
     *
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    /**
     * 用户确认心愿
@@ -2497,6 +2519,12 @@
    R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/common/data/population/selectByIdCard")
    R selectByIdCard(@RequestParam("idCard") String idCard);
    /**
     * 根据id实有人口详细信息
     *
     * @param populationId
@@ -3835,6 +3863,15 @@
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);
    /**
     * 导出高龄认证记录 exportElderAuthRecords  导出高龄认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/export")
    R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
@@ -4916,6 +4953,22 @@
    R getCommunityLists();
    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();
    /**
     * 综治app-小区列表
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @PostMapping("/village/grid/list/app")
    R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO
@@ -5268,11 +5321,11 @@
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     *
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -5323,7 +5376,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
    /**
     * 根据日期查询值班领导
@@ -5331,7 +5384,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
    /**
     * 批量导入值班表
@@ -5496,6 +5549,8 @@
    @PostMapping("/reserve/commit")
    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO
@@ -5670,11 +5725,12 @@
    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @return  登记明细数据
     *
     * @param pageReserveRegisterDetailedAdminDTO
     * @return 登记明细数据
     */
    @GetMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
    @PostMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
    /**
     * 查询预约登记题目列表
@@ -6979,6 +7035,22 @@
    R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActActivityCode/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActActivityCode/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
@@ -6986,6 +7058,647 @@
    R timedTaskHouseJobHandler();
    /**
     * 导出特殊群体
     *
     * @param pageInputUserDTO 请求参数
     * @return 特殊群体列表
     */
    @PostMapping("common/data/special/export")
    R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAnnouncement/queryAll")
    R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAnnouncement/{id}")
    R comActAnnouncementSelectOne(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAnnouncement")
    R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAnnouncement/update")
    R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAnnouncement/del")
    R comActAnnouncementDelete(@RequestParam("id") Long id);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActColumn/queryAll")
    R comActColumnSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActColumn/{id}")
    R comActColumnSelectOne(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param comActColumn 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActColumn")
    R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);
    /**
     * 修改数据
     *
     * @param comActColumn 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActColumn/update")
    R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActColumn/del")
    R comActColumnDelete(@RequestParam("id") Long id);
    /**
     * 高龄认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
    /**
     * 养老认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("/activity/sign-in/list")
    R listSignInRecord(@RequestParam("id") Long id);
    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("/activity/regist/list")
    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);
    /**
     * 获取活动类型(目前只有志愿者活动需要获取)
     * @param communityId
     * @param type
     * @return
     */
    @GetMapping("/activity/type/list")
    R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    @PostMapping("/activity/type/add")
    R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
    /**
     * 我的评价
     * @param userId
     * @param activityId
     * @return
     */
    @GetMapping("/activity/my-evaluate")
    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/register/homeQuarantine/page")
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page")
    R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/add")
    R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/update")
    R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/get")
    R getComPropertyPublicity(@RequestParam("id") Long id);
    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @DeleteMapping("/property/publicity/delete")
    R deleteComPropertyPublicity(@RequestParam("id") Long id);
    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    @GetMapping("/property/publicity/list/property")
    R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);
    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page/applet")
    R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);
    /**
     * 获取预设图片
     * @param type
     * @param subtype
     * @return
     */
    @GetMapping("/picture/library/get")
    R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);
    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @PostMapping("/rentingHousesConfig/page")
    R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);
    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @PutMapping("/rentingHousesConfig/update")
    R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);
    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/register")
    R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/update")
    R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/page")
    R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @PutMapping("/rentingHourseRegister/releaseOrCancel")
    R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);
    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @DeleteMapping("/rentingHourseRegister/delete")
    R deleteRentingHouse(@RequestParam("registerId") Long registerId);
    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @GetMapping("/rentingHourseRegister/get")
    R getRentingHouse(@RequestParam("registerId") Long registerId);
    /**
     * 附近的房源
     */
    @PostMapping("/rentingHourseRegister/nearby")
    R nearby(@RequestBody NearbyDTO nearbyDTO);
    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/houseList")
    R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHourseOrder/queryAll")
    R selectRentingHourseOrderAll(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHourseOrder/{id}")
    R selectRentingHourseOrderOne(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHourseOrder")
    R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);
    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHourseOrder/update")
    R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/rentingHourseOrder/del")
    R deleteRentingHourseOrder(@RequestParam("id") Long id);
    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @PostMapping("/rentingHourseOrder/wxNotify")
    R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);
    /**
     * 支付付款
     */
    @PostMapping("/rentingHourseOrder/wxPay")
    R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHoursePreOrder/queryAll")
    R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHoursePreOrder/{id}")
    R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHoursePreOrder")
    R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHoursePreOrder/update")
    R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/rentingHoursePreOrder/del")
    R deleteRentingHoursePreOrder(@RequestParam("id") Long id);
    /**
     * 普通订单统计
     */
    @PostMapping("/rentingHourseOrder/statics")
    R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);
    /**
     * 定金订单统计
     */
    @PostMapping("/rentingHoursePreOrder/statics")
    R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    @GetMapping("/rentingHousesConfig/getConfig")
    R getRentingHouseConfig(@RequestParam("type") Integer type);
    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();
    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();
    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();
    /**
     * 通过社区id查询社区账号密码
     * @param communityId   社区id
     * @return  查询社区账号密码
     */
    @GetMapping("/screen/getCommunityPassword")
    R getCommunityPassword(@RequestParam("communityId") Long communityId);
    @GetMapping("/reserve/bigScreenStaticsReserve")
    R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityLine")
    R partyActivityLine(@RequestParam("communityId")Long communityId);
    /**
     * 党员积分前3
     * @param communityId
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestParam("communityId")Long communityId);
    /**
     * 社区服务大屏数据分析接口
     */
    @GetMapping("/screen/serviceData")
    R serviceData(@RequestParam("communityId")Long communityId);
    /**
     * 服务居民接口
     */
    @GetMapping("/screen/serviceUser")
    R serviceUser(@RequestParam("communityId") Long communityId);
    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @GetMapping("/screen/resident/autonomy")
    R getResidentAutonomy(@RequestParam("communityId") Long communityId);
    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @GetMapping("/screen/grids/governance")
    R getGridsGovernance(@RequestParam("communityId") Long communityId);
    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/community/service")
    R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @PostMapping("/screen/merchant/popular")
    R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
    /**
     * 新版大屏首页接口
     */
    @GetMapping("/screen/indexInfo")
    R indexInfo(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/microWish")
    R indexMicroWish(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/easyPhoto")
    R indexEasyPhoto(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/index/easyPhotoList")
    R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/questionnaire")
    R indexQuestionnaire(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/dyn")
    R indexDyn(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/dynList")
    R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/neighbor")
    R indexNeighbor(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/neighborList")
    R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/merchant")
    R indexMerchant(@RequestParam("communityId") Long communityId);
    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/merchantList")
    R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/microWishList")
    R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/questionnaireList")
    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1320,6 +1320,14 @@
    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
    /**
     * 新版绘制多边形统计数据
     * @param eventListDTO
     * @return
     */
    @PostMapping("/screen/getCivilDrawListNew")
    R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO);
    /**
     * 大屏-根据小区id查询小区统计人数
     * 
     * @param villageId
@@ -1353,4 +1361,21 @@
     */
    @GetMapping("/screen/member/trajectory")
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);
    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/screen/comprehensive/governance")
    R getComprehensiveGovernanceStatics();
    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    @GetMapping("/screen/village/statistics-new")
    R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -340,10 +340,12 @@
     *            用户id
     * @param communityId
     *            社区id 同一用户在不同社区都是党员
     * @param status
     * @return 党建活动列表
     */
    @PostMapping("/partybuildIng/listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
                   @RequestParam(value = "status", required = false) Integer status);
    /**
     * 党员活动人员参入列表
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1084,4 +1084,12 @@
     */
    @GetMapping("community/statistics/export")
    R communityStatisticsExport();
    /**
     * 通过UnionId获取用户信息
     * @param unionId
     * @return
     */
    @GetMapping("/getByUnionId")
    R getUserInfoByUnionId(@RequestParam("unionId") String unionId);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -3,9 +3,16 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;
import javax.imageio.ImageIO;
import javax.xml.bind.DatatypeConverter;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URL;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.UUID;
/**
 * @author lyq
@@ -26,7 +33,7 @@
        //构建单个用户数据
        List<Object> userData = new ArrayList<>();
        String noExport = "以上信息仅用于疫苗防控";
        String noExport = "以上信息仅用于";
        //遍历答案列表
        Long reserveRecordId = 0L;
        Long reserveSubId = 0L;
@@ -89,6 +96,17 @@
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
@@ -122,6 +140,18 @@
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
                            sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -848,6 +848,21 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(calendar.getTime()) + " 23:59:59";
    }
    /**
     * 获取当前月最后一天
     *
     * @return
     */
    public static Date getLastDayOfMonth() {
        Calendar calendar = Calendar.getInstance();
        calendar.add(Calendar.MONTH, 1);
        calendar.set(Calendar.DAY_OF_MONTH, 0);
        // 格式化日期
        return calendar.getTime();
    }
    /**
     * 获取当前时间(年月日)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java
New file
@@ -0,0 +1,91 @@
package com.panzhihua.common.utlis;
import java.io.FileInputStream;
import lombok.extern.slf4j.Slf4j;
/**
 * FileType 应用模块名称
 * <p>
 * 代码描述 文件类型判断工具类
 * <p>
 * Copyright: Copyright (C) 2021 XXX, Inc. All rights reserved.
 * <p>
 * Company: 成都呐喊信息技术有限公司
 * <p>
 *
 * @author manailin
 * @since 2021/10/8 10:52
 */
@Slf4j
public class FileType {
    private static final String NOT_IMAGE_FILE_TYPE = "0000";
    private static String bytesToHexString(byte[] src) {
        StringBuilder stringBuilder = new StringBuilder();
        if (src == null || src.length <= 0) {
            return null;
        }
        for (int i = 0; i < src.length; i++) {
            int v = src[i] & 0xFF;
            String hv = Integer.toHexString(v);
            if (hv.length() < 2) {
                stringBuilder.append(0);
            }
            stringBuilder.append(hv);
        }
        return stringBuilder.toString();
    }
    /**
     * [方法描述] 判断上传的文件是否是规定的文件文件,通过文件头标识确定
     *
     * @param is
     * @return boolean
     * @author manailin
     * @date 2021/10/28 16:50
     */
    public static Boolean checkFileType(FileInputStream is) throws Exception {
        byte[] b = new byte[3];
        is.read(b, 0, b.length);
        String photo = bytesToHexString(b);
        photo = photo.toUpperCase();
        String fileHeadCode = TypeDict.checkFileType(photo);
        log.info("上传的文件类型{}", fileHeadCode);
        return !fileHeadCode.equals(NOT_IMAGE_FILE_TYPE);
    }
    /**
     * [方法描述] 判断上传的文件是否是图片文件,通过文件头标识确定
     *
     * @param is
     * @return boolean
     * @author manailin
     * @date 2021/10/28 16:50
     */
    public static Boolean checkImageType(FileInputStream is) throws Exception {
        byte[] b = new byte[3];
        is.read(b, 0, b.length);
        String photo = bytesToHexString(b);
        photo = photo.toUpperCase();
        String fileHeadCode = TypeDict.checkImageType(photo);
        log.info("上传的文件类型{}", fileHeadCode);
        return !fileHeadCode.equals(NOT_IMAGE_FILE_TYPE);
    }
    /**
     * [方法描述] 方法参照流程
     *
     * @param args
     */
//     public static void main(String[] args) throws Exception {
//     FileInputStream is = new FileInputStream("D:\\Pictures\\3.mp4");
//     byte[] b = new byte[3];
//     is.read(b, 0, b.length);
//     String photo = bytesToHexString(b);
//     photo = photo.toUpperCase();
//     System.out.println("头文件是:" + photo);
//    String ooo = TypeDict.checkFileType(photo);
//     System.out.println("后缀名是:" + ooo);
//     }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
New file
@@ -0,0 +1,220 @@
package com.panzhihua.common.utlis;
import cn.hutool.core.date.DateUtil;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;
import javax.xml.bind.DatatypeConverter;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
/**
 * @author zzj
 */
@Slf4j
public class HomeQuarantineUtil {
    /**
     * 数据转换--登记明细用户填写答案导出数据格式转换
     *
     * @param answerContentVOList 用户答题记录
     * @return 用户填写答案数据
     */
    public static List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
        //结果数据集合
        List<List<Object>> resultList = new ArrayList<>();
        //构建单个用户数据
        List<Object> userData = new ArrayList<>();
        String noExport = "以上信息仅用于";
        //遍历答案列表
        Long reserveRecordId = 0L;
        Long reserveSubId = 0L;
        Integer count=0;
        StringBuffer conditions=new StringBuffer();
        Boolean isOldDuo = false;
        StringBuffer sb = new StringBuffer();
        if (answerContentVOList != null && answerContentVOList.size() > 0) {
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                if(count%16==0){
                   conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd")) +" "+"上午体温"+userAnswers.getAnswerContent()+"℃"+"\n");
                   count++;
                   continue;
                }
                if(count%16==1){
                    conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"下午体温"+userAnswers.getAnswerContent()+"℃"+"\n");
                    count++;
                    continue;
                }
                if(count%16==2){
                    conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况:"+userAnswers.getAnswerContent()+"\n");
                    conditions.append("————————"+"\n");
                    count++;
                    continue;
                }
                count++;
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
                        || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
                    continue;
                }
                //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
                if (reserveRecordId.equals(0L)) {
                    reserveRecordId = userAnswers.getReserveRecordId();
                    userData.add(userAnswers.getNickName());
                    userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                }
                //根据reserveRecordId判断是否是第二条填报记录
                if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
                    reserveSubId = 0L;
                    if(isOldDuo){
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                        isOldDuo = false;
                    }
                    for(List<Object> result:resultList){
                            if(result.get(4).equals(userData.get(4))){
                                String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
                                result.set(result.size()-1,condition);
                                userData.set(userData.size()-1,null);
                            break;
                        }
                    }
                    if(userData.get(userData.size()-1)!=null){
                        resultList.add(userData);
                    }
                    userData = new ArrayList<>();
                    reserveRecordId = userAnswers.getReserveRecordId();
                    userData.add(userAnswers.getNickName());
                    userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                    if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                        userData.add(userAnswers.getAnswerContent());
                    }else{
                        userData.add(" ");
                    }
                }else{
                    if(reserveSubId.equals(0L)){
                        reserveSubId = userAnswers.getReserveSubId();
                    }
                    if(!reserveSubId.equals(userAnswers.getReserveSubId())){
                        reserveSubId = userAnswers.getReserveSubId();
                        //如果是承诺字段则不导出
                        if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
                            continue;
                        }
                        //判断当前的组件类型是否是图片上传,导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
                            sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                            continue;
                        }else{
                            if(isOldDuo){
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }else{
                        //如果是承诺字段则不导出
                        if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
                            continue;
                        }
                        //判断当前的组件类型是否是图片上传,导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败!");
                            }
                            continue;
                        }
                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
                            sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                            continue;
                        }else{
                            if(isOldDuo){
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }
                }
                if(count%16==0){
                    userData.add(conditions.toString());
                    conditions=new StringBuffer();
                }
            }
            if(isOldDuo){
                String answer = sb.toString();
                userData.add(answer.substring(0, answer.length() - 1));
            }
            for(List<Object> result:resultList){
                if(result.get(4).equals(userData.get(4))){
                    String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
                    result.set(result.size()-1,condition);
                    userData.set(userData.size()-1,null);
                    break;
                }
            }
            if(userData.get(userData.size()-1)!=null){
                resultList.add(userData);
            }
        }
        return resultList;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java
@@ -1,5 +1,8 @@
package com.panzhihua.common.utlis;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
 * @description: 身份证手机号脱敏处理
 * @author: Null
@@ -38,4 +41,16 @@
        return idNumber;
    }
    public static String replaceName(String str) {
        if(StringUtils.isNotEmpty(str)){
            if(str.length()==2){
                str=str.replace(str.substring(1),"*");
            }
            if(str.length()>2) {
                str=str.replace(str.substring(1,str.length()-1),"*");
            }
        }
        return str;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java
New file
@@ -0,0 +1,64 @@
package com.panzhihua.common.utlis;
/**
 * 应用模块名称
 * <p>
 * 代码描述
 * <p>
 * Copyright: Copyright (C) 2021 XXX, Inc. All rights reserved.
 * <p>
 * Company: 成都呐喊信息技术有限公司
 * <p>
 *
 * @author manailin
 * @since 2021/10/8 10:51
 */
public class TypeDict {
    /**
     * 常用文件的文件头如下:(以前六位为准) JPEG (jpg),文件头:FFD8FF PNG (png),文件头:89504E47 GIF (gif),文件头:47494638 TIFF (tif),文件头:49492A00
     * Windows Bitmap (bmp),文件头:424D CAD (dwg),文件头:41433130 Adobe Photoshop (psd),文件头:38425053 Rich Text Format
     * (rtf),文件头:7B5C727466 XML (xml),文件头:3C3F786D6C HTML (html),文件头:68746D6C3E Email [thorough only]
     * (eml),文件头:44656C69766572792D646174653A Outlook Express (dbx),文件头:CFAD12FEC5FD746F Outlook (pst),文件头:2142444E MS
     * Word/Excel (xls.or.doc),文件头:D0CF11E0 MS Access (mdb),文件头:5374616E64617264204A WordPerfect (wpd),文件头:FF575043
     * Postscript (eps.or.ps),文件头:252150532D41646F6265 Adobe Acrobat (pdf),文件头:255044462D312E Quicken (qdf),文件头:AC9EBD8F
     * Windows Password (pwl),文件头:E3828596 ZIP Archive (zip),文件头:504B0304 RAR Archive (rar),文件头:52617221 Wave
     * (wav),文件头:57415645 AVI (avi),文件头:41564920 Real Audio (ram),文件头:2E7261FD Real Media (rm),文件头:2E524D46 MPEG
     * (mpg),文件头:000001BA MPEG (mpg),文件头:000001B3 Quicktime (mov),文件头:6D6F6F76 Windows Media (asf),文件头:3026B2758E66CF11
     * MIDI (mid),文件头:4D546864,文件头:FFF328(满添加mp3),文件头:000000(满添加mp4)
     */
    public static String checkImageType(String type) {
        switch (type) {
            case "FFD8FF":
                return "jpg";
            case "89504E":
                return "png";
            case "474946":
                return "gif";
            default:
                return "0000";
        }
    }
    public static String checkFileType(String fileType) {
        switch (fileType) {
            case "FFD8FF":
                return "jpg";
            case "89504E":
                return "png";
            case "474946":
                return "gif";
            case "574156":
                return "wav";
            case "415649":
                return "avi";
            case "FFF328":
                return "mp3";
            case "000000":
                return "mp4";
            default:
                return "0000";
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java
@@ -8,6 +8,7 @@
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableCaching
@@ -17,6 +18,7 @@
@EnableEurekaClient
@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
@ComponentScan({"com.panzhihua.community_backstage", "com.panzhihua.common"})
@EnableAsync
public class CommunityBackstageApplication {
    public static void main(String[] args) {
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
@@ -134,4 +134,24 @@
        pagePartyOrganizationVO.setCommunityId(id);
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }
    /**
     * 党员活动折线图
     * @return
     */
    @ApiOperation(value = "党员活动折线图", response = BigScreenActivityLine.class)
    @GetMapping("/partyActivityLine")
    public R partyActivityLine(){
        return communityService.partyActivityLine(this.getCommunityId());
    }
    /**
     * 党员积分前3
     * @return
     */
    @ApiOperation(value = "党员积分前3", response = BigScreenActivityTop.class)
    @GetMapping("/partyActivityTop")
    public R partyActivityTop(){
        return communityService.partyActivityTop(this.getCommunityId());
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -1,14 +1,30 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpConstant;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.HttpUtils;
import io.swagger.annotations.ApiImplicitParam;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
@@ -42,6 +58,8 @@
    private GridService gridService;
    @Resource
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;
    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -182,7 +200,253 @@
        return gridService.getGridsMemberTrajectory(communityId);
    }
    /**
     * 西区大屏治理数据
     */
    @ApiOperation(value = "西区大屏治理数据@lyq", response = WestScreenStatics.class)
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return communityService.westScreenStatics();
    }
    @ApiOperation(value = "西区大数据分析平台-综合治理栏", response = EventComprehensiveGovernanceStatisticsVO.class)
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return gridService.getComprehensiveGovernanceStatics();
    }
    @ApiOperation(value = "西区大数据分析平台-一标三实栏", response = EventPopulationStatisticsVO.class)
    @GetMapping("/comprehensive/population")
    public R getComprehensivePopulationStatics(@RequestParam(value = "streetId",required = false,defaultValue = "0") Long streetId) {
        return communityService.getComprehensivePopulationStatics(streetId);
    }
    /**
     * 新版大屏首页接口
     */
    @ApiOperation(value = "新版大屏首页接口", response = IndexInfo.class)
    @GetMapping("/indexInfo")
    public R indexInfo(){
        return communityService.indexInfo(this.getCommunityId());
    }
    /**
     * 首页二级页面-微心愿
     */
    @ApiOperation(value = "首页二级页面-微心愿", response = BigScreenMicroWishStatisticsInfo.class)
    @GetMapping("/index/microWish")
    public R indexMicroWish() {
        return communityService.indexMicroWish(this.getCommunityId());
    }
    /**
     * 首页二级页面-微心愿展示列表
     */
    @ApiOperation(value = "首页二级页面-微心愿展示列表", response = ComActMicroWishVO.class)
    @PostMapping("/index/microWishList")
    public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexMicroWishList(pageBaseDTO);
    }
    /**
     * 首页二级页面-随手拍
     */
    @ApiOperation(value = "首页二级页面-随手拍", response = BigScreenEasyPhotoStatisticsInfo.class)
    @GetMapping("/index/easyPhoto")
    public R indexEasyPhoto() {
        return communityService.indexEasyPhoto(this.getCommunityId());
    }
    /**
     * 首页二级页面-随手拍展示列表
     */
    @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActEasyPhotoVO.class)
    @PostMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexEasyPhotoList(pageBaseDTO);
    }
    /**
     * 首页二级页面-社区问卷
     */
    @ApiOperation(value = "首页二级页面-社区问卷", response = BigScreenQuestionnaireStatisticsInfo.class)
    @GetMapping("/index/questionnaire")
    public R indexQuestionnaire() {
        return communityService.indexQuestionnaire(this.getCommunityId());
    }
    /**
     * 首页二级页面-社区问卷展示列表
     */
    @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActQuestnaireVO.class)
    @PostMapping("/index/questionnaireList")
    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexQuestionnaireList(pageBaseDTO);
    }
    /**
     * 首页二级页面-社区动态
     */
    @ApiOperation(value = "首页二级页面-社区动态", response = BigScreenDynStatisticsInfo.class)
    @GetMapping("/index/dyn")
    public R indexDyn() {
        return communityService.indexDyn(this.getCommunityId());
    }
    /**
     * 首页二级页面-社区动态展示列表
     */
    @ApiOperation(value = "首页二级页面-社区动态展示列表", response = ComActDynVO.class)
    @PostMapping("/index/dynList")
    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexDynList(pageBaseDTO);
    }
    /**
     * 首页二级页面-邻里圈
     */
    @ApiOperation(value = "首页二级页面-邻里圈", response = BigScreenNeighborStatisticsInfo.class)
    @GetMapping("/index/neighbor")
    public R indexNeighbor() {
        return communityService.indexNeighbor(this.getCommunityId());
    }
    @ApiOperation(value = "西区大数据分析平台-西区街道列表", response = EventPopulationStreetVO.class)
    @GetMapping("/comprehensive/street/list")
    public R getComprehensiveStreetList() {
        return communityService.getComprehensiveStreetList();
    }
    /**
     * 首页二级页面-邻里圈展示列表
     */
    @ApiOperation(value = "首页二级页面-邻里圈展示列表", response = ComActNeighborCircleAdminVO.class)
    @PostMapping("/index/neighborList")
    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexNeighborList(pageBaseDTO);
    }
    @ApiOperation(value = "分页获取党建动态", response = BigScreenStatisticPartyOrg.class)
    @PostMapping("/comprehensive/partydyn")
    public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        partyBuildingComPbDynVO.setType(1);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }
    /**
     * 首页二级页面-便民商家
     */
    @ApiOperation(value = "首页二级页面-便民商家", response = BigScreenMerchantStatisticsInfo.class)
    @GetMapping("/index/merchant")
    public R indexMerchant() {
        return communityService.indexMerchant(this.getCommunityId());
    }
    @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
    @PostMapping("/comprehensive/pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
        return communityService.pageDynamic(comActDynVO);
    }
    @ApiOperation(value = "通过社区id查询社区账号密码")
    @PostMapping("/get/community/password")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
            return R.fail("参数错误");
        }
        return communityService.getCommunityPassword(communityId);
    }
    /**
     * 首页二级页面-商家展示列表
     */
    @ApiOperation(value = "首页二级页面-商家展示列表", response = ConvenientMerchantVO.class)
    @PostMapping("/index/merchantList")
    public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexMerchantList(pageBaseDTO);
    }
    /**
     * 社区服务大屏数据分析接口
     */
    @ApiOperation(value = "社区服务大屏数据分析接口", response = BigScreenServiceData.class)
    @GetMapping("/serviceData")
    public R serviceData(){
        return this.communityService.serviceData(this.getCommunityId());
    }
    /**
     * 服务居民接口
     */
    @ApiOperation(value = "社区服务大屏服务居民接口", response = BigScreenServiceUser.class)
    @GetMapping("/serviceUser")
    public R serviceUser(){
        return this.communityService.serviceUser(this.getCommunityId());
    }
    @ApiOperation(value = "大数据分析平台-居民自治", response = ResidentAutonomyStatisticsVO.class)
    @GetMapping("/resident/autonomy")
    public R getResidentAutonomy() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getResidentAutonomy(communityId);
    }
    @ApiOperation(value = "大数据分析平台-清网治格", response = GridsGovernanceStatisticsVO.class)
    @GetMapping("/grids/governance")
    public R getGridsGovernance() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getGridsGovernance(communityId);
    }
    @ApiOperation(value = "新版事件大屏画圈展示事件坐标点接口", response = GridsGovernanceStatisticsVO.class)
    @PostMapping("/civil/draw/list-new")
    public R civilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
        Long id = this.getCommunityId();
        if (id == null) {
            return R.fail(401, "请先登录");
        }
        eventListDTO.setCommunityId(id);
        return gridService.getCivilDrawListNew(eventListDTO);
    }
    @ApiOperation(value = "新版根据小区id获取小区信息", response = GridsGovernanceStatisticsVO.class)
    @GetMapping("/civil/village/statistics-new")
    public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
        if (villageId == null) {
            return R.fail("参数错误");
        }
        return gridService.civilVillageStatisticsNew(villageId);
    }
    @ApiOperation(value = "大数据分析平台-社区服务", response = BigScreenCommunityStatisticsVO.class)
    @GetMapping("/community/service")
    public R getCommunityServiceStatistics() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getCommunityServiceStatistics(communityId);
    }
    @ApiOperation(value = "分页获取热度排行商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/popular")
    public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        pagePopularMerchantDTO.setCommunityId(communityId);
        return communityService.getScreenPopularMerchants(pagePopularMerchantDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java
New file
@@ -0,0 +1,56 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.RestController;
import javax.annotation.Resource;
/**
 * 签到二维码表(ComActActivityCode)表控制层
 *
 * @author makejava
 * @since 2021-10-15 15:23:10
 */
@Slf4j
@Api(tags = {"活动二维码"})
@RestController
@RequestMapping("comActActivityCode")
public class ComActActivityCodeApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 查看二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("查看二维码")
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.getQRCode(qrCodeVO);
    }
    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("重置二维码")
    @PostMapping("/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        return this.communityService.resetQRCode(qrCodeVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java
New file
@@ -0,0 +1,99 @@
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.ComActAnnouncementVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
/**
 * (ComActAnnouncement)表控制层
 *
 * @author makejava
 * @since 2021-11-01 13:45:55
 */
@Slf4j
@Api(tags = {"通知公告"})
@RestController
@RequestMapping("comActAnnouncement")
public class ComActAnnouncementApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActAnnouncementVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.comActAnnouncementSelectAll(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActAnnouncementSelectOne(id);
    }
    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        comActAnnouncementVO.setCreateTime(new Date());
        comActAnnouncementVO.setCommunityId(this.getCommunityId());
        comActAnnouncementVO.setUserId(this.getUserId());
       return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
    }
    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        return this.communityService.comActAnnouncementUpdate(comActAnnouncementVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActAnnouncementDelete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
@@ -42,6 +42,7 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.comActColumnSelectAll(commonPage);
    }
@@ -66,6 +67,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setCommunityId(this.getCommunityId());
        comActColumnVO.setStatus(1);
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
@@ -102,3 +104,4 @@
        return this.communityService.comActColumnDelete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -1,5 +1,26 @@
package com.panzhihua.community_backstage.api;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO;
import com.panzhihua.community_backstage.util.MyAESUtil;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.BeanUtils;
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.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -12,39 +33,47 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.ReserveRecordStatusEnum;
import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
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.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationExcelVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireStatisticsSummaryExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailedExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AssemblyUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.HomeQuarantineUtil;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.CustemSecondhandler;
import com.panzhihua.community_backstage.excel.Custemhandler;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 * @description: 预约登记接口
@@ -56,6 +85,7 @@
@RestController
@RequestMapping("/reserve")
public class ComActReserveApi extends BaseController {
    private static final String key="nahankeji1234567";
    @Resource
    private CommunityService communityService;
@@ -67,8 +97,10 @@
    @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) {
        Long communityId = this.getCommunityId();
        pageReserveDTO.setCommunityId(communityId);
        if(pageReserveDTO.getCommunityId()==null){
            Long communityId = this.getCommunityId();
            pageReserveDTO.setCommunityId(communityId);
        }
        return communityService.pageReserveAdmin(pageReserveDTO);
    }
@@ -464,9 +496,8 @@
    }
    @ApiOperation(value = "导出登记明细")
    @GetMapping("/register/list/export")
    public R exportRegister(@RequestParam("reserveId") Long reserveId) {
    @PostMapping("/register/list/export")
    public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "登记明细导出数据.xlsx";
        String noHaed = "承诺";
@@ -484,7 +515,7 @@
                     * 组合导出数据
                     * 用户问卷答案
                     */
                    R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(reserveId);
                    R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
                    QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
                    List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs();
@@ -521,22 +552,27 @@
                    headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    //设置头字体
                    WriteFont headWriteFont = new WriteFont();
                    headWriteFont.setFontHeightInPoints((short)14);
                    headWriteFont.setFontHeightInPoints((short)6);
                    headWriteFont.setBold(true);
                    headWriteCellStyle.setWriteFont(headWriteFont);
                    WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
                    //设置表格内容字体
                    WriteFont writeFont = new WriteFont();
                    writeFont.setFontHeightInPoints((short)6);
                    //设置 水平居中
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    //设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);
                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                            new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class)
                    excelWriter = EasyExcel.write(fileName)
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();
@@ -568,6 +604,125 @@
        }
    }
    @ApiOperation(value = "导出居家隔离统计")
    @PostMapping("/register/list/export/homeQuarantine")
    public R exportRegisterHomeQuarantineStatistics(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        String name= "居家隔离统计表.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        String noHaed = "承诺";
        List<List<Object>> datalist = new ArrayList<>();
        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;
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    /**
                     * 组合导出数据
                     * 用户问卷答案
                     */
                    R exportResultR = communityService.exportHomeQuarantine(pageReserveRegisterDetailedAdminDTO);
                    HomeQuarantineRegisterExportVO exportVO = JSON.parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class);
                    List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs();
                    //构造表头
                    List<List<String>> headList = new ArrayList<List<String>>();
                    String firstRowContent = "重点地区或高风险地区来攀返攀人员信息统计表(居家隔离表)";
                    List<String> head0 = new ArrayList<>();
                    head0.add(firstRowContent);
                    head0.add("登记人昵称");
                    headList.add(head0);
                    List<String> head1 = new ArrayList<>();
                    head1.add(firstRowContent);
                    head1.add("登记时间");
                    headList.add(head1);
                    subVOList.forEach(sub -> {
                        if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午") &&
                                !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            if(!sub.getContent().equals(noHaed)){
                                if(sub.getType() == 11){
                                    headn.add(sub.getContent().substring(0, sub.getContent().indexOf("(")));
                                }else{
                                    headn.add(sub.getContent());
                                }
                                headList.add(headn);
                            }
                        }
                    });
                    List<String> head2 = new ArrayList<>();
                    head2.add(firstRowContent);
                    head2.add("隔离体温情况");
                    headList.add(head2);
                    //数据转换
                    datalist = exportVO.getDataList();
                    WriteCellStyle headWriteCellStyle = new WriteCellStyle();
                    //设置头居中
                    headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    //设置头字体
                    WriteFont headWriteFont = new WriteFont();
                    headWriteFont.setFontHeightInPoints((short)6);
                    headWriteFont.setBold(true);
                    headWriteCellStyle.setWriteFont(headWriteFont);
                    WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
                    //设置表格内容字体
                    WriteFont writeFont = new WriteFont();
                    writeFont.setFontHeightInPoints((short)6);
                    //设置 水平居中
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
                    //设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);
                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                            new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
                    excelWriter = EasyExcel.write(fileName)
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new CustemSecondhandler())
                            .build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("居家隔离统计表").head(headList).build();
                    excelWriter.write(datalist, 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 = "分页查询居家隔离统计", response = ComActReserveRegisterDetailedVO.class)
    @PostMapping("/register/homeQuarantine/page")
    public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return communityService.pageRegisterHomeQuarantine(detailedAdminDTO);
    }
    @ApiOperation(value = "查询题目列表", response = ComActReserveSubListVO.class)
    @GetMapping("/subject/list")
    public R subjectList(@RequestParam("reserveId") Long reserveId) {
@@ -586,4 +741,15 @@
        return communityService.registerDetailedDetailAdmin(reserveRecordId);
    }
    @ApiOperation("对外用户提交数据")
    @PostMapping("/commit/noToken")
    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
        return communityService.reserveCommitNoToken(comActReserveCommitVO);
    }
    @ApiOperation(value = "查询西区社区列表")
    @GetMapping("/westList/noToken")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists();
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
New file
@@ -0,0 +1,104 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.validation.annotation.Validated;
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.enums.PresetPictureType;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComActPictureLibraryVO;
import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
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: ComPropertyPublicityApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传相关接口
 * @author: hans
 * @date: 2021/11/11 10:08
 */
@Slf4j
@Api(tags = {"物业宣传相关接口"})
@RestController
@RequestMapping("/property/publicity")
public class ComPropertyPublicityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation(value = "分页物业宣传信息", response = ComPropertyPublicityVO.class)
    @PostMapping("/page")
    public R pageComPropertyPublicity(@RequestBody @Valid PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        pageComPropertyPublicityDTO.setCommunityId(loginUserInfo.getCommunityId());
        pageComPropertyPublicityDTO.setUserId(loginUserInfo.getUserId());
        return communityService.pageComPropertyPublicity(pageComPropertyPublicityDTO);
    }
    @ApiOperation(value = "新增物业宣传")
    @PostMapping("/add")
    public R addComPropertyPublicity(@RequestBody @Validated(AddGroup.class) ComPropertyPublicityDTO comPropertyPublicityDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        comPropertyPublicityDTO.setCommunityId(loginUserInfo.getCommunityId());
        comPropertyPublicityDTO.setUserId(loginUserInfo.getUserId());
        return communityService.addComPropertyPublicity(comPropertyPublicityDTO);
    }
    @ApiOperation(value = "修改物业宣传")
    @PostMapping("/update")
    public R updateComPropertyPublicity(@RequestBody @Validated(PutGroup.class) ComPropertyPublicityDTO comPropertyPublicityDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        comPropertyPublicityDTO.setCommunityId(loginUserInfo.getCommunityId());
        comPropertyPublicityDTO.setUserId(loginUserInfo.getUserId());
        return communityService.updateComPropertyPublicity(comPropertyPublicityDTO);
    }
    @ApiOperation(value = "查看物业宣传信息", response = ComPropertyPublicityVO.class)
    @GetMapping("/get")
    @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
    public R getComPropertyPublicity(@RequestParam("id") Long id) {
        return communityService.getComPropertyPublicity(id);
    }
    @ApiOperation(value = "删除物业宣传")
    @DeleteMapping("/delete")
    @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
    public R deleteComPropertyPublicity(@RequestParam("id") Long id) {
        return communityService.deleteComPropertyPublicity(id);
    }
    @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
    @GetMapping("/list/property")
    @ApiImplicitParam(name = "villageId", value = "小区id", required = false)
    public R listProperty(@RequestParam(value = "villageId", required = false) Long villageId) {
        return communityService.listProperty(villageId, getCommunityId());
    }
    @ApiOperation(value = "获取预设图库",response = ComActPictureLibraryVO.class)
    @GetMapping("/picture/library")
    @ApiImplicitParam(name = "publicityType", value = "宣传类型(1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主)", required = true)
    public R getPresetPictureLibrary(@RequestParam("publicityType") Integer publicityType) {
        return communityService.getPresetPictureLibrary(PresetPictureType.PROPERTY_PUBLICITY, publicityType);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
@@ -92,8 +92,10 @@
    @ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
    @PostMapping("/pagePatrolRecord")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        if(comSwPatrolRecordPageDTO.getCommunityId()==null){
            Long communityId = this.getCommunityId();
            comSwPatrolRecordPageDTO.setCommunityId(communityId);
        }
        return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }
@@ -151,8 +153,10 @@
    @ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
    @PostMapping("/pageSafetyWorkRecord")
    public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        if(comSwPatrolRecordPageDTO.getCommunityId()==null){
            Long communityId = this.getCommunityId();
            comSwPatrolRecordPageDTO.setCommunityId(communityId);
        }
        return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
    }
@@ -209,8 +213,10 @@
    @ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
    @PostMapping("/pageDangerReport")
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        if(comSwPatrolRecordPageDTO.getCommunityId()==null){
            Long communityId = this.getCommunityId();
            comSwPatrolRecordPageDTO.setCommunityId(communityId);
        }
        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
    }
@@ -425,7 +431,7 @@
    @ApiOperation(value = "根据日期查询值班人员")
    @GetMapping("/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaPersonByDate(rotaDate);
        return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
    }
    /**
@@ -436,7 +442,7 @@
    @ApiOperation(value = "根据日期查询值班领导")
    @GetMapping("/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaLeaderByDate(rotaDate);
        return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
    }
    /**
@@ -545,7 +551,7 @@
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    File file0=new File("d:/safetyWork/file");
                    File file0=new File("/mnt/data/web/file");
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
@@ -553,8 +559,8 @@
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
                    sftp.download("/mnt/data/web/excel/", "安全工作记录.ftl", "d:/safetyWork/file/安全工作记录.ftl");
                    sftp.download("/mnt/data/web/excel/", "blank.jpg", "d:/safetyWork/file/blank.jpg");
                    sftp.download("/mnt/data/web/excel/", "安全工作记录.ftl", "/mnt/data/web/file/安全工作记录.ftl");
                    sftp.download("/mnt/data/web/excel/", "blank.jpg", "/mnt/data/web/file/blank.jpg");
                    try {
                        // 日期
                        if (comSwSafetyWorkRecordVO.getPatrolTime() != null) {
@@ -595,105 +601,12 @@
                            photo = Arrays.asList(comSwSafetyWorkRecordVO.getRecordPhoto().split(","));
                        }
                        if (photo.size() != 0 && null != photo) {
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            List<Object> list=new ArrayList<>();
                            for (int i = 0; i < photo.size(); i++) {
                                downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwSafetyWorkRecordVO.getId() + "_find_" + i + ".jpg"));
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg"));
                            }
                            dataMap.put("imgList",list);
                        }
                        // 备注
                        if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRemark())) {
@@ -754,7 +667,7 @@
                        // configuration.setClassForTemplateLoading(this.getClass(), "");
                        // 指定路径的第二种方式,我的路径是C:/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("d:/safetyWork/file/"));
                        configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/file/"));
                        // 输出文档路径及名称
                        // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -794,9 +707,6 @@
            sftp.uploadMore(ftpUrl, name , inputStream);
            sftp.logout();
            inputStream.close();
            FileUtils.deleteDirectory(new File(property+File.separator+"word"+File.separator));
            FileUtils.deleteDirectory(new File(zipFile));
            FileUtils.deleteDirectory(new File("d:/safetyWork/file/"));
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        } catch (SftpException e) {
@@ -831,7 +741,7 @@
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    File file0=new File("d:/patrolRecord/file");
                    File file0=new File("/mnt/data/web/file");
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
@@ -839,8 +749,8 @@
                    if(!file0.isDirectory()&&!file0.exists()){
                        file0.mkdirs();
                    }
                    sftp.download("/mnt/data/web/excel/", "巡查记录.ftl", "d:/patrolRecord/file/巡查记录.ftl");
                    sftp.download("/mnt/data/web/excel/", "blank.jpg", "d:/patrolRecord/file/blank.jpg");
                    sftp.download("/mnt/data/web/excel/", "巡查记录.ftl", "/mnt/data/web/file/巡查记录.ftl");
                    sftp.download("/mnt/data/web/excel/", "blank.jpg", "/mnt/data/web/file/blank.jpg");
                    try {
                        // 日期
                        if (comSwPatrolRecordVO.getPatrolTime() != null) {
@@ -856,7 +766,7 @@
                            dataMap.put("patrolType", "");
                        }
                        // 社区名称
                        // dataMap.put("communityName", comSwPatrolRecordVO.getCommunityName());
                            dataMap.put("communityName", comSwPatrolRecordVO.getCommunityName());
                        // 地址
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getAddress())) {
                            dataMap.put("address", comSwPatrolRecordVO.getAddress());
@@ -881,105 +791,12 @@
                            photo = Arrays.asList(comSwPatrolRecordVO.getRecordPhoto().split(","));
                        }
                        if (photo.size() != 0 && null != photo) {
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            List<Object> list=new ArrayList<>();
                            for (int i = 0; i < photo.size(); i++) {
                                downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwPatrolRecordVO.getId() + "_find_" + i + ".jpg"));
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                        dataMap.put("imgStr" + (i + 1),
                                                getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                            getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg"));
                            }
                            dataMap.put("imgList",list);
                        }
                        // 备注
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRemark())) {
@@ -1051,7 +868,7 @@
                        // configuration.setClassForTemplateLoading(this.getClass(), "");
                        // 指定路径的第二种方式,我的路径是C:/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("d:/patrolRecord/file/"));
                        configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/file/"));
                        // 输出文档路径及名称
                        // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -1091,9 +908,6 @@
            sftp.uploadMore(ftpUrl, name , inputStream);
            sftp.logout();
            inputStream.close();
            FileUtils.deleteDirectory(new File(property+File.separator+"word"+File.separator));
            FileUtils.deleteDirectory(new File(zipFile));
            FileUtils.deleteDirectory(new File("d:/patrolRecord/file/"));
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        } catch (SftpException e) {
@@ -1128,7 +942,7 @@
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                File file0=new File("d:/dangerReport/file");
                File file0=new File("/mnt/data/web/file");
                if(!file0.isDirectory()&&!file0.exists()){
                    file0.mkdirs();
                }
@@ -1136,8 +950,8 @@
                if(!file0.isDirectory()&&!file0.exists()){
                    file0.mkdirs();
                }
                sftp.download("/mnt/data/web/excel/", "隐患报告.ftl", "d:/dangerReport/file/隐患报告.ftl");
                sftp.download("/mnt/data/web/excel/", "blank.jpg", "d:/dangerReport/file/blank.jpg");
                sftp.download("/mnt/data/web/excel/", "隐患报告.ftl", "/mnt/data/web/file/隐患报告.ftl");
                sftp.download("/mnt/data/web/excel/", "blank.jpg", "/mnt/data/web/file/blank.jpg");
                try {
                    // 日期
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getCheckTime())) {
@@ -1145,6 +959,7 @@
                    } else {
                        dataMap.put("date", "");
                    }
                    dataMap.put("communityName",comSwDangerReportVO.getCommunityName());
                    // 巡查类型
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getPatrolType())) {
                        dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
@@ -1205,182 +1020,17 @@
                        dataMap.put("takeSteps", "");
                    }
                    // 措施照片
                    List<String> stepsPhoto = new ArrayList<>();
                    List<String> photo1 = new ArrayList<>();
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getStepsPhoto())) {
                        stepsPhoto = Arrays.asList(comSwDangerReportVO.getStepsPhoto().split(","));
                        photo1 = Arrays.asList(comSwDangerReportVO.getStepsPhoto().split(","));
                    }
                    if (stepsPhoto.size() != 0 && null != stepsPhoto) {
                        if (stepsPhoto.size() == 1) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 1) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 1) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                    if (photo1.size() != 0 && null != photo1) {
                        List<Object> list=new ArrayList<>();
                        for (int i = 0; i < photo1.size(); i++) {
                            downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_step_" + i, "/mnt/data/web/file/");
                            list.add(getImageStr("/mnt/data/web/file/" + comSwDangerReportVO.getId() + "_step_" + i + ".jpg"));
                        }
                        if (stepsPhoto.size() == 2) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 2) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 2) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 3) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 3) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 3) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 4) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 4) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 4) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 5) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 5) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 5) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 6) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 6) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 6) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 7) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 7) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 7) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 8) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 8) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 1),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                            for (int i = 0; i < 9; i++) {
                                if (i < 8) {
                                    dataMap.put("imgStr" + (i + 19),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (stepsPhoto.size() == 9) {
                            for (int i = 0; i < 9; i++) {
                                downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                dataMap.put("imgStr" + (i + 19),
                                    getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                            }
                            for (int i = 0; i < 9; i++) {
                                downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/");
                                dataMap.put("imgStr" + (i + 1),
                                    getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                            }
                        }
                    } else {
                        for (int i = 0; i < 9; i++) {
                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg"));
                        }
                        for (int i = 0; i < 9; i++) {
                            dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg"));
                        }
                        dataMap.put("imgList",list);
                    }
                    // 社区处理建议
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getCommunitySuggestion())) {
@@ -1419,110 +1069,17 @@
                        dataMap.put("findRecord", "");
                    }
                    // 记录照片
                    List<String> photo = new ArrayList<>();
                    List<String> photo2 = new ArrayList<>();
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getRecordPhoto())) {
                        photo = Arrays.asList(comSwDangerReportVO.getRecordPhoto().split(","));
                        photo2 = Arrays.asList(comSwDangerReportVO.getRecordPhoto().split(","));
                    }
                    if (photo.size() != 0 && null != photo) {
                        if (photo.size() == 1) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 1) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                    if (photo2.size() != 0 && null != photo2) {
                        List<Object> list=new ArrayList<>();
                        for (int i = 0; i < photo2.size(); i++) {
                                downloadPicture(photo2.get(i), comSwDangerReportVO.getId() + "_find_" + i, "/mnt/data/web/file/");
                                list.add(getImageStr("/mnt/data/web/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                        }
                        if (photo.size() == 2) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 2) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 3) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 3) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 4) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 4) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 5) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 5) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 6) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 6) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 7) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 7) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 8) {
                            for (int i = 0; i < 9; i++) {
                                if (i < 8) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                    dataMap.put("imgStr" + (i + 10),
                                        getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                } else {
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                                }
                            }
                        }
                        if (photo.size() == 9) {
                            for (int i = 0; i < 9; i++) {
                                downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                                dataMap.put("imgStr" + (i + 10),
                                    getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                            }
                        }
                    } else {
                        for (int i = 0; i < 9; i++) {
                            dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg"));
                        }
                        dataMap.put("imgList2",list);
                    }
                    // 备注
                    if (StringUtils.isNotEmpty(comSwDangerReportVO.getRemark())) {
@@ -1574,7 +1131,7 @@
                    // configuration.setClassForTemplateLoading(this.getClass(), "");
                    // 指定路径的第二种方式,我的路径是C:/a.ftl
                    configuration.setDirectoryForTemplateLoading(new File("d:/dangerReport/file/"));
                    configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/file/"));
                    // 输出文档路径及名称
                    // File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() +
@@ -1614,9 +1171,6 @@
            sftp.uploadMore(ftpUrl, name , inputStream);
            sftp.logout();
            inputStream.close();
            FileUtils.deleteDirectory(new File(property+File.separator+"word"+File.separator));
            FileUtils.deleteDirectory(new File(zipFile));
            FileUtils.deleteDirectory(new File("d:/dangerReport/file/"));
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        } catch (SftpException e) {
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -498,11 +498,12 @@
    @ApiOperation(value = "特殊群体-数据导出")
    @PostMapping("/special/export")
    public R dataExportSpecilPopulation() {
    public R dataExportSpecilPopulation(@RequestBody PageInputUserDTO pageInputUserDTO) {
        // 获取登陆用户
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        // 获取登陆用户绑定社区id
        Long communityId = loginUserInfo.getCommunityId();
        pageInputUserDTO.setCommunityId(communityId);
        // 生成动态模板excel通过ftp工具上传到主节点,然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "特殊群体导出数据.xlsx";
@@ -517,13 +518,13 @@
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    List<ComMngPopulationVO> populList = JSON.parseArray(
                        JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),
                        ComMngPopulationVO.class);
                    List<InputUserInfoVO> populList = JSON.parseArray(
                        JSON.toJSONString(communityService.specialInputUserExport(pageInputUserDTO).getData()),
                            InputUserInfoVO.class);
                    List<ComMngPopulationExcelVo> populationExcelVoList = new ArrayList<>();
                    if (populList != null && populList.size() > 0) {
                        for (ComMngPopulationVO popul : populList) {
                            if (popul.getLabel() == null) {
                        for (InputUserInfoVO popul : populList) {
                            if (popul.getTags() == null) {
                                continue;
                            }
                            ComMngPopulationExcelVo populationExcelVo = new ComMngPopulationExcelVo();
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -1,31 +1,43 @@
package com.panzhihua.community_backstage.api;
import java.io.*;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.vos.LiveVO;
import com.panzhihua.common.model.vos.WeatherVO;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.Version;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
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.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.panzhihua.common.controller.BaseController;
@@ -34,7 +46,18 @@
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActPictureVO;
import com.panzhihua.common.model.vos.community.ComActActRegistExcelVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActSignExcelVO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO;
@@ -42,8 +65,18 @@
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.QRCodeUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.Version;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -95,7 +128,21 @@
    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody ComActActivityVO comActActivityVO) {
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        if (comActActivityVO.getHaveIntegralReward().intValue() == 1) {
            if (isNull(comActActivityVO.getRewardWay())) {
                return R.fail("奖励方式不能为空");
            }
            if (isNull(comActActivityVO.getRewardIntegral())) {
                return R.fail("奖励积分不能为空");
            }
            if (comActActivityVO.getRewardWay().intValue() == 1 && isNull(comActActivityVO.getLimit())) {
                return R.fail("参与次数上限不能为空");
            }
        }
        if(nonNull(comActActivityVO.getVolunteerMax()) && comActActivityVO.getVolunteerMax().intValue() == 0) {
            return R.fail("志愿者参与上限不能为0");
        }
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
@@ -231,6 +278,7 @@
        if (R.isOk(r)) {
            List<ComActActSignExcelVO> excelVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActActSignExcelVO.class);
            excelVOS.forEach(e -> e.generateCondition());
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
@@ -243,8 +291,7 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActActSignExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("活动报名名单导出数据").build();
                        excelWriter.write(excelVOS, writeSheet);
                        excelWriter.finish();
@@ -465,6 +512,7 @@
        return R.fail("未查询到用户");
    }
    @Deprecated
    @ApiOperation(value = "社区活动签到二维码下载")
    @PostMapping("qrCode/export")
    public R activityRegistQRCodeExport(@RequestParam("activityId") Long activityId){
@@ -589,16 +637,6 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        Date publishAt = comActDynVO.getPublishAt();
        if (!ObjectUtils.isEmpty(publishAt)) {
            long time = publishAt.getTime();
            long l = System.currentTimeMillis();
            if (l >= time) {
                comActDynVO.setStatus(1);
            } else {
                comActDynVO.setStatus(0);
            }
        }
        comActDynVO.setCommunityId(communityId);
        return communityService.putDynamic(comActDynVO);
    }
@@ -722,6 +760,11 @@
    @GetMapping("community/list")
    public R getCommunityLists() {
        return communityService.getCommunityLists();
    }
    @ApiOperation(value = "查询西区社区列表")
    @GetMapping("community/westList")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists();
    }
    @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
@@ -1055,4 +1098,18 @@
        }
        return communityService.wishHandleListAdmin(loginUserInfo.getCommunityId(),type);
    }
    @ApiOperation(value = "添加活动类型")
    @PostMapping("activity/type/add")
    public R addActivityType(@RequestBody @Validated(AddGroup.class) ComActActivityTypeVO comActActivityTypeVO) {
        comActActivityTypeVO.setCommunityId(getCommunityId());
        return communityService.addActivityType(comActActivityTypeVO);
    }
    @ApiOperation(value = "获取活动类型(目前只有志愿者活动需要获取)", response = ComActActivityTypeVO.class)
    @ApiImplicitParam(name = "type", value = "活动类型(1.志愿者 2.居民 3.党员)", required = true)
    @GetMapping("activity/type/list")
    public R listActivityType(@RequestParam("type") Integer type) {
        return communityService.listActivityType(getCommunityId(), type);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -11,6 +11,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.util.BaseUtils;
import lombok.Data;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
@@ -40,11 +46,6 @@
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
@@ -215,6 +216,26 @@
        }
    }
    @ApiOperation(value = "上传文件")
    @PostMapping(value = "/upload/file/noToken")
    public R uploadImageNoToken(@RequestBody Base64File file, HttpServletRequest request) {
        if(StringUtils.isEmpty(file.getFile())){
            return R.fail("文件不能为Null");
        }
        String name = UUID.randomUUID().toString().replaceAll("-", "")+".jpg";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = BaseUtils.base64StrToInputStream(file.getFile().replace("data:image/png;base64,","").replace("data:image/jpg;base64,","").replace("data:image/jpeg;base64,",""));
            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 = "minio上传文件测试")
    @PostMapping(value = "/minio/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R minipuploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -101,6 +101,7 @@
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }
    @ApiOperation(value = "编辑人脸采集数据通过、驳回、删除")
    @PutMapping("putuserface")
    public R putUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO) {
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -442,16 +442,6 @@
        if (null == id || 0 == id) {
            return R.fail("动态主键不能为空");
        }
        Date publishAt = partyCommitteeVO.getPublishAt();
        if (!ObjectUtils.isEmpty(publishAt)) {
            long time = publishAt.getTime();
            long l = System.currentTimeMillis();
            if (l > time) {
                partyCommitteeVO.setStatus(1);
            } else {
                partyCommitteeVO.setStatus(2);
            }
        }
        return partyBuildingService.updateYnamic(partyCommitteeVO);
    }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -300,16 +300,17 @@
    /**
     * 高龄认证导出 exportElderAuthRecords  高龄认证导出
     * @param    ids   高龄认证记录id集合
     * @param    pageElderAuthRecordsDTO
     * @return    R  导出结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @ApiOperation(value = "高龄认证-高龄认证导出---")
    @PostMapping("/authRecords/export")
    public R exportElderAuthRecords(@RequestBody List<Long> ids) {
    public R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
        // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class);
        // 生成动态模板excel通过ftp工具上传到主节点,然后返回模板下载地址
        pageElderAuthRecordsDTO.setCommunityId(this.getCommunityId());
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "高龄认证导出数据" + nowDate + ".xlsx";
@@ -324,7 +325,7 @@
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    R r = communityService.getElderAuthRecordsByIds(ids);
                    R r = communityService.exportElderAuthRecords(pageElderAuthRecordsDTO);
                    List<ComElderAuthRecordExcleVO> list = new ArrayList<>();
                    if (R.isOk(r)) {
                        list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComElderAuthRecordExcleVO.class);
@@ -592,6 +593,32 @@
        return communityService.signPensionAuthRecords(comPensionAuthRecordVO);
    }
    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @ApiOperation(value = "高龄认证添加")
    @PostMapping("/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        comElderAuthRecordVO.setSubmitUserId(this.getUserId());
        comElderAuthRecordVO.setCommunityId(this.getCommunityId());
        return communityService.addAuthRecord(comElderAuthRecordVO);
    }
    /**
     * 养老认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @ApiOperation(value = "养老认证添加")
    @PostMapping("/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        comElderAuthRecordVO.setSubmitUserId(this.getUserId());
        comElderAuthRecordVO.setCommunityId(this.getCommunityId());
        return communityService.addPensionAuthRecordVO(comElderAuthRecordVO);
    }
    /**
     * 养老认证导出 exportPensionAuthRecords  养老认证导出
     * @param    ids   养老认证记录id集合
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -88,4 +88,18 @@
        return r;
    }
    @ApiOperation(value = "西区大屏登录", response = LoginReturnVO.class)
    @PostMapping("xq/login")
    public R xqdpLogin(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password);
        return r;
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHourseOrderApi.java
New file
@@ -0,0 +1,123 @@
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:46:57
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁普通订单相关接口"})
@RequestMapping("rentingHourseOrder")
public class RentingHourseOrderApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = RentingHourseOrderVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectRentingHourseOrderAll(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "分页查询所有数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectRentingHourseOrderOne(id);
    }
    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @ApiOperation("创建订单")
    @PostMapping
    public R insert(@RequestBody RentingHourseOrderVO rentingHourseOrder) {
        rentingHourseOrder.setCommunityId(this.getCommunityId());
        return communityService.insertRentingHourseOrder(rentingHourseOrder);
    }
    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseOrderVO rentingHourseOrdervo) {
        return communityService.updateRentingHourseOrder(rentingHourseOrdervo);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteRentingHourseOrder(id);
    }
    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @ApiOperation("支付回调处理订单状态以及房屋状态")
    @PostMapping("/wxNotify")
    public R wxNotify(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO){
        return communityService.wxNotifyRentingHourseOrder(wxPayNotifyOrderVO);
    }
    /**
     * 支付付款
     */
    @ApiOperation("支付付款")
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody WxPayOrderVO wxPayOrderVO){
        return communityService.wxPayRentingHourseOrder(wxPayOrderVO);
    }
    /**
     * 普通订单统计
     */
    @ApiOperation("普通订单统计")
    @PostMapping("/statics")
    public R statics(@RequestBody RentingHourseOrderVO rentingHourseOrderVO){
        rentingHourseOrderVO.setCommunityId(this.getCommunityId());
        return communityService.staticsRentingHourseOrder(rentingHourseOrderVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHoursePreOrderApi.java
New file
@@ -0,0 +1,104 @@
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.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:47:54
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁定金订单相关接口"})
@RequestMapping("rentingHoursePreOrder")
public class RentingHoursePreOrderApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = RentingHoursePreOrderVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectAllRentingHoursePreOrder(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "详情",response = RentingHoursePreOrderVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneRentingHoursePreOrder(id);
    }
    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "创建定金订单")
    @PostMapping
    public R insert(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        rentingHoursePreOrderVO.setCommunityId(this.getCommunityId());
        return communityService.insertRentingHoursePreOrder(rentingHoursePreOrderVO);
    }
    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改")
    @PostMapping("/update")
    public R update(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
       return communityService.updateRentingHoursePreOrder(rentingHoursePreOrderVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteRentingHoursePreOrder(id);
    }
    /**
     * 订单统计
     */
    @ApiOperation("定金订单统计")
    @PostMapping("/statics")
    public R statics(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO){
        rentingHoursePreOrderVO.setCommunityId(this.getCommunityId());
        return communityService.staticsRentingHoursePreOrder(rentingHoursePreOrderVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHousesApi.java
New file
@@ -0,0 +1,109 @@
package com.panzhihua.community_backstage.api;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
import org.springframework.validation.annotation.Validated;
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.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.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
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: RentingHousesApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 房屋租赁相关接口
 * @author: hans
 * @date: 2021/11/24 10:18
 */
@RestController
@Slf4j
@Api(tags = {"房屋租赁相关接口"})
@RequestMapping("/renting/houses")
public class RentingHousesApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @ApiOperation("新增房源信息")
    @PostMapping("/register")
    public R registerRentingHouse(@RequestBody @Validated(AddGroup.class) RentingHouseRegisterDTO registerDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.registerRentingHouse(registerDTO);
    }
    @ApiOperation("编辑房源信息")
    @PostMapping("/update")
    public R updateRentingHouse(@RequestBody @Validated(PutGroup.class) RentingHouseRegisterDTO registerDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.updateRentingHouse(registerDTO);
    }
    @ApiOperation(value = "分页获取房源信息", response = RentingHouseRegisterVO.class)
    @PostMapping("/page")
    public R pageRentingHouse(@RequestBody @Valid PageRentingHouseRegisterDTO pageRegisterDTO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        pageRegisterDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageRentingHouse(pageRegisterDTO);
    }
    @ApiOperation("发布/取消发布 房源信息")
    @PutMapping("/releaseOrCancel")
    public R releaseOrCancelHouse(@RequestBody @Valid ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO) {
        return communityService.releaseOrCancelHouse(releaseOrCancelHouseDTO);
    }
    @ApiOperation("删除房源信息")
    @DeleteMapping("/delete")
    @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
    public R deleteRentingHouse(@RequestParam("registerId") Long registerId) {
        return communityService.deleteRentingHouse(registerId);
    }
    @ApiOperation(value = "获取详情-房源信息", response = RentingHouseRegisterVO.class)
    @GetMapping("/get")
    @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
    public R getRentingHouse(@RequestParam("registerId") Long registerId) {
        return communityService.getRentingHouse(registerId);
    }
    @ApiOperation(value = "获取房屋租赁配置",response = RentingHousesConfigVO.class)
    @GetMapping("/getConfig")
    @ApiImplicitParam(name = "type", value = "配置类型(1.房屋租赁合同 2.租赁合同变更协议 3.定金协议 4.房屋委托代理合同" +
            "5.平台须知 6.房源标签)", required = true)
    public R getRentingHouseConfig(@RequestParam("type") Integer type) {
        return communityService.getRentingHouseConfig(type);
    }
    @ApiOperation(value = "方便开发阶段手动调用批量更新小程序码")
    @GetMapping("/updateAllHouseUnionAppCode")
    public R updateAllHouseUnionAppCode() {
        communityService.updateAllHouseUnionAppCode();
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
@@ -284,4 +285,9 @@
        return communityService.detailDynamic(id);
    }
    @ApiOperation(value = "安全防控",response = BigScreenStaticsReserve.class)
    @GetMapping("/reserve")
    public R reserve(){
        return communityService.bigScreenStaticsReserve(this.getCommunityId());
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/CustemSecondhandler.java
New file
@@ -0,0 +1,73 @@
package com.panzhihua.community_backstage.excel;
import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
import org.apache.poi.ss.usermodel.Cell;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class CustemSecondhandler extends AbstractColumnWidthStyleStrategy {
    private  Map<Integer, Map<Integer, Integer>> CACHE = new HashMap(8);
    public CustemSecondhandler() {
    }
    @Override
    protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
        boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
        if (needSetWidth) {
            Map<Integer, Integer> maxColumnWidthMap = (Map)CACHE.get(writeSheetHolder.getSheetNo());
            if (maxColumnWidthMap == null) {
                maxColumnWidthMap = new HashMap(16);
                CACHE.put(writeSheetHolder.getSheetNo(), maxColumnWidthMap);
            }
            Integer columnWidth = this.dataLength(cellDataList, cell, isHead);
            if (columnWidth >= 0) {
                if (columnWidth > 25) {
                    columnWidth = 25;
                }
                Integer maxColumnWidth = (Integer)((Map)maxColumnWidthMap).get(cell.getColumnIndex());
                if (maxColumnWidth == null || columnWidth > maxColumnWidth) {
                    ((Map)maxColumnWidthMap).put(cell.getColumnIndex(), columnWidth);
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 75);
                }
                if(cell.getStringCellValue().equals("隔离体温情况")){
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(),70*75);
                }
            }
        }
    }
    private Integer dataLength(List<CellData> cellDataList, Cell cell, Boolean isHead) {
        if (isHead) {
            return cell.getStringCellValue().getBytes().length;
        } else {
            CellData cellData = cellDataList.get(0);
            CellDataTypeEnum type = cellData.getType();
            if (type == null) {
                return -1;
            } else {
                switch(type) {
                    case STRING:
                        return cellData.getStringValue().getBytes().length;
                    case BOOLEAN:
                        return cellData.getBooleanValue().toString().getBytes().length;
                    case NUMBER:
                        return cellData.getNumberValue().toString().getBytes().length;
                    default:
                        return -1;
                }
            }
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/Custemhandler.java
@@ -33,14 +33,17 @@
            Integer columnWidth = this.dataLength(cellDataList, cell, isHead);
            if (columnWidth >= 0) {
                if (columnWidth > 30) {
                    columnWidth = 30;
                if (columnWidth > 20) {
                    columnWidth = 20;
                }
                Integer maxColumnWidth = (Integer)((Map)maxColumnWidthMap).get(cell.getColumnIndex());
                if (maxColumnWidth == null || columnWidth > maxColumnWidth) {
                    ((Map)maxColumnWidthMap).put(cell.getColumnIndex(), columnWidth);
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 90);
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 75);
                }
                if(cell.getStringCellValue().equals("有无")){
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(),30*75);
                }
            }
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/BaseUtils.java
New file
@@ -0,0 +1,24 @@
package com.panzhihua.community_backstage.util;
import org.bouncycastle.util.encoders.Base64;
import java.io.*;
/**
 * @author zzj
 */
public class BaseUtils {
    public static InputStream base64StrToInputStream(String base64string) {
        ByteArrayInputStream stream = null;
        try {
            byte[] bytes = Base64.decode(base64string);
            stream = new ByteArrayInputStream(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return stream;
    }
}
springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml
@@ -54,7 +54,6 @@
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.2.6.RELEASE" level="project" />
@@ -62,7 +61,6 @@
    <orderEntry type="library" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: joda-time:joda-time:2.3" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
@@ -192,7 +190,6 @@
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
    <orderEntry type="library" name="Maven: com.tencentcloudapi:tencentcloud-sdk-java:3.1.286" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.12.0" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
@@ -204,6 +201,8 @@
    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
@@ -225,5 +224,19 @@
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.minio:minio:6.0.8" level="project" />
    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-xml:1.37.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.37.0" level="project" />
    <orderEntry type="library" name="Maven: io.opencensus:opencensus-api:0.24.0" level="project" />
    <orderEntry type="library" name="Maven: io.grpc:grpc-context:1.33.0" level="project" />
    <orderEntry type="library" name="Maven: io.opencensus:opencensus-contrib-http-util:0.24.0" level="project" />
    <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.4" level="project" />
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
    <orderEntry type="library" name="Maven: joda-time:joda-time:2.7" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
  </component>
</module>
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -80,7 +81,16 @@
        commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
        commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addCommon(commonEventAddDTO);
        R r = gridService.addCommon(commonEventAddDTO);
        if(R.isOk(r)){
            GridMemberPositionDTO memberPositionDTO = new GridMemberPositionDTO();
            memberPositionDTO.setGridMemberId(loginUserInfoVO.getUserId());
            memberPositionDTO.setPositionAddress(commonEventAddDTO.getHappenAddress());
            String []lngLatString = commonEventAddDTO.getHappentLatLng().split(",");
            memberPositionDTO.setLngLat(lngLatString[1] + "," + lngLatString[0]);
            gridService.gridReportPosition(memberPositionDTO);
        }
        return r;
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java
@@ -29,7 +29,7 @@
    public R list(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        villageListAppDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        return communityService.getGridVillageList(villageListAppDTO);
        return communityService.getGridVillageListApp(villageListAppDTO);
    }
    @ApiOperation(value = "小区楼栋列表@lyq", response = ComMngVillageBuildingVO.class)
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java
@@ -58,7 +58,7 @@
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventManageDTO.setUserId(loginUserInfoVO.getUserId());
        // pageEventManageDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        pageEventManageDTO.setRevokeType(1);
//        pageEventManageDTO.setRevokeType(1);
        return gridService.queryEventToManage(pageEventManageDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/pom.xml
@@ -73,6 +73,10 @@
            <artifactId>commons-lang</artifactId>
            <version>2.6</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-amqp</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
@@ -88,6 +92,18 @@
            <artifactId>core</artifactId>
            <version>3.3.3</version>
        </dependency>
        <!-- lbs附近定位 -->
        <dependency>
            <groupId>com.spatial4j</groupId>
            <artifactId>spatial4j</artifactId>
            <version>0.5</version>
        </dependency>
        <!--        微信小程序-->
        <dependency>
            <groupId>com.github.binarywang</groupId>
            <artifactId>weixin-java-miniapp</artifactId>
            <version>3.9.9.B</version>
        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java
@@ -85,4 +85,24 @@
        bigscreenPartyactivity(@RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
        return bigScreenService.bigscreenPartyactivity(bigScreenStatisticPartyActivityDTO);
    }
    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    @GetMapping("/partyActivityLine")
    public R partyActivityLine(@RequestParam("communityId")Long communityId){
        return bigScreenService.partyActivityLine(communityId);
    }
    /**
     * 党员积分前3
     * @param communityId
     * @return
     */
    @GetMapping("/partyActivityTop")
    public R partyActivityTop(@RequestParam("communityId")Long communityId){
        return bigScreenService.partyActivityTop(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -2,6 +2,11 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import com.panzhihua.service_community.service.BigScreenService;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
@@ -18,6 +23,12 @@
    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComActService comActService;
    @Resource
    private BigScreenService bigScreenService;
    @Resource
    private BigScreenStatisticsService bigScreenStatisticsService;
    /**
     * 首页大屏统计接口
@@ -79,4 +90,210 @@
        return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));
    }
    /**
     * 西区大屏治理数据
     */
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return comMngPopulationService.westScreenStatics();
    }
    @GetMapping("/getComprehensivePopulationStatics")
    public R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId){
        return comMngPopulationService.getComprehensivePopulationStatics(streetId);
    }
    @GetMapping("/getComprehensiveStreetList")
    public R getComprehensiveStreetList(){
        return comMngPopulationService.getComprehensiveStreetList();
    }
    @GetMapping("/getCommunityPassword")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId){
        return comActService.getCommunityPassword(communityId);
    }
    /**
     * 新版大屏首页接口
     */
    @GetMapping("/indexInfo")
    public R indexInfo(@RequestParam("communityId") Long communityId){
        return comMngPopulationService.indexInfo(communityId);
    }
    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/index/microWish")
    public R indexMicroWish(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexMicroWish(communityId);
    }
    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/index/easyPhoto")
    public R indexEasyPhoto(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexEasyPhoto(communityId);
    }
    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO);
    }
    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/index/questionnaire")
    public R indexQuestionnaire(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexQuestionnaire(communityId);
    }
    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/index/dyn")
    public R indexDyn(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexDyn(communityId);
    }
    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/dynList")
    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexDynList(pageBaseDTO);
    }
    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/index/neighbor")
    public R indexNeighbor(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexNeighbor(communityId);
    }
    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/neighborList")
    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexNeighborList(pageBaseDTO);
    }
    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/index/merchant")
    public R indexMerchant(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexMerchant(communityId);
    }
    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/merchantList")
    public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexMerchantList(pageBaseDTO);
    }
    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/microWishList")
    public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexMicroWishList(pageBaseDTO);
    }
    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/questionnaireList")
    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexQuestionnaireList(pageBaseDTO);
    }
    /**
     * 社区服务大屏数据分析接口
     */
    @GetMapping("/serviceData")
    public R serviceData(@RequestParam("communityId")Long communityId){
        return this.bigScreenService.serviceData(communityId);
    }
    /**
     * 服务居民接口
     */
    @GetMapping("/serviceUser")
    public R serviceUser(@RequestParam("communityId") Long communityId){
        return this.bigScreenService.serviceUser(communityId);
    }
    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @GetMapping("/resident/autonomy")
    public R getResidentAutonomy(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getResidentAutonomy(communityId);
    }
    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @GetMapping("/grids/governance")
    public R getGridsGovernance(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getGridsGovernance(communityId);
    }
    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @GetMapping("/community/service")
    public R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getCommunityServiceStatistics(communityId);
    }
    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @PostMapping("/merchant/popular")
    public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
        return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
New file
@@ -0,0 +1,132 @@
package com.panzhihua.service_community.api;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.util.QRCodeUtil;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
 * 签到二维码表(ComActActivityCode)表控制层
 *
 * @author makejava
 * @since 2021-10-15 15:23:10
 */
@RestController
@RequestMapping("comActActivityCode")
public class ComActActivityCodeApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActActivityCodeService comActActivityCodeService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActActivityCodeService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.comActActivityCodeService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param comActActivityCode 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActActivityCode comActActivityCode) {
        return R.ok(this.comActActivityCodeService.save(comActActivityCode));
    }
    /**
     * 修改数据
     *
     * @param comActActivityCode 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActActivityCode comActActivityCode) {
        return R.ok(this.comActActivityCodeService.updateById(comActActivityCode));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActActivityCodeService.removeById(id));
    }
    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        ComActActivityCode comActActivityCode = comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>()
                .lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId())
                .eq(ComActActivityCode::getType,qrCodeVO.getType()));
        if(comActActivityCode!=null){
            qrCodeVO.setCodeId(comActActivityCode.getId());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail("该活动无有效二维码");
    }
    /**
     * 重置二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/resetQRCode")
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
        ComActActivityCode comActActivityCode=comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()));
        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.setCreateTime(new Date());
            comActActivityCode1.setType(qrCodeVO.getType());
            comActActivityCode1.setStatus(1);
            comActActivityCodeService.save(comActActivityCode1);
            qrCodeVO.setCodeId(comActActivityCode1.getId());
            return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
        }
        return R.fail();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAnnouncementApi.java
New file
@@ -0,0 +1,87 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.service.ComActAnnouncementService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * (ComActAnnouncement)表控制层
 *
 * @author makejava
 * @since 2021-11-01 13:45:55
 */
@RestController
@RequestMapping("comActAnnouncement")
public class ComActAnnouncementApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActAnnouncementService comActAnnouncementService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActAnnouncementService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActAnnouncementService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        ComActAnnouncement comActAnnouncement=new ComActAnnouncement();
        BeanUtils.copyProperties(comActAnnouncementVO,comActAnnouncement);
        return R.ok(this.comActAnnouncementService.save(comActAnnouncement));
    }
    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        ComActAnnouncement comActAnnouncement=new ComActAnnouncement();
        BeanUtils.copyProperties(comActAnnouncementVO,comActAnnouncement);
        return R.ok(this.comActAnnouncementService.updateById(comActAnnouncement));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActAnnouncementService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
@@ -20,7 +20,7 @@
 * 分类列表(ComActColumn)表控制层
 *
 * @author makejava
 * @since 2021-10-20 17:28:14
 * @since 2021-11-01 14:38:26
 */
@RestController
@RequestMapping("comActColumn")
@@ -87,6 +87,6 @@
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActColumnService.removeById(id));
        return this.comActColumnService.delete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java
@@ -142,11 +142,11 @@
    }
    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/act/activity/admin")
    public R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId) {
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActPictureLibraryApi.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_community.api;
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActPictureLibraryService;
import io.swagger.annotations.ApiOperation;
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 com.panzhihua.common.service.community.CommunityService;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComActPictureLibraryApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 公共图库
 * @author: hans
 * @date: 2021/11/23 16:54
 */
@Slf4j
@RestController
@RequestMapping("/picture/library")
public class ComActPictureLibraryApi {
    @Resource
    private ComActPictureLibraryService comActPictureLibraryService;
    @GetMapping("/get")
    @ApiOperation("获取预设图库")
    public R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype) {
        return comActPictureLibraryService.getPresetPictureLibrary(type, subtype);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -111,8 +111,14 @@
    }
    /**
     *
     * 外部调用提交预约/登记
     * @param comActReserveCommitVO
     * @return
     */
    @PostMapping("/commitNoToken")
    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
        return comActReserveService.commitNoToken(comActReserveCommitVO);
    }
    /**
     * 小程序提交预约/登记
@@ -255,12 +261,12 @@
    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @param pageReserveRegisterDetailedAdminDTO 登记id
     * @return  登记明细数据
     */
    @GetMapping("/admin/register/list/export")
    public R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId){
        return comActReserveAnswerContentService.exportRegisterAdmin(reserveId);
    @PostMapping("/admin/register/list/export")
    public R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
        return comActReserveAnswerContentService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
    }
    /**
@@ -322,4 +328,29 @@
    public R list(@RequestParam("communityId") Long communityId){
        return comActReserveService.reserveListApplets(communityId);
    }
    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/admin/register/homeQuarantine/page")
    public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.pageRegisterHomeQuarantine(detailedAdminDTO);
    }
    /**
     * 居家隔离导出
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/admin/homeQuarantine/export")
    public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO);
    }
    @GetMapping("/bigScreenStaticsReserve")
    public R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId){
        return comActReserveAnswerContentService.bigScreenStaticsReserve(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -170,6 +170,11 @@
        return comMngVillageService.getGridVillageList(villageListAppDTO);
    }
    @PostMapping("/village/grid/list/app")
    public R getGridPopulationAdminListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
        return comMngVillageService.getGridVillageList(villageListAppDTO);
    }
    /**
     * 综治app-根据小区id查询小区下楼栋列表
     * 
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyPublicityApi.java
New file
@@ -0,0 +1,113 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComPropertyPublicityService;
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 lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
/**
 * @title: ComPropertyPublicityApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传相关接口
 * @author: hans
 * @date: 2021/11/11 10:08
 */
@Slf4j
@RestController
@RequestMapping("/property/publicity")
public class ComPropertyPublicityApi {
    @Resource
    private ComPropertyPublicityService comPropertyPublicityService;
    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/page")
    public R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        return comPropertyPublicityService.pageComPropertyPublicity(pageComPropertyPublicityDTO);
    }
    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/add")
    public R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO){
        return comPropertyPublicityService.addComPropertyPublicity(comPropertyPublicityDTO);
    }
    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/update")
    public R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO) {
        return comPropertyPublicityService.updateComPropertyPublicity(comPropertyPublicityDTO);
    }
    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @GetMapping("/get")
    public R getComPropertyPublicity(@RequestParam("id") Long id) {
        return comPropertyPublicityService.getComPropertyPublicity(id);
    }
    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteComPropertyPublicity(@RequestParam("id") Long id) {
        return comPropertyPublicityService.deleteComPropertyPublicity(id);
    }
    /**
     * 物业公司列表
     * @param communityId
     * @return
     */
    @GetMapping("/list/property")
    public R listProperty(@RequestParam(value = "villageId", required = false) Long villageId,
                          @RequestParam("communityId") Long communityId) {
        return comPropertyPublicityService.listProperty(villageId, communityId);
    }
    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/page/applet")
    public R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        return comPropertyPublicityService.pageComPropertyPublicityApplet(pageComPropertyPublicityDTO);
    }
    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @GetMapping("/incr-view")
    public R incrPropertyPublicityView(@RequestParam("id") Long id) {
        return comPropertyPublicityService.incrView(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -288,8 +288,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaPersonByDate(rotaDate);
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaPersonByDate(rotaDate,communityId);
    }
    /**
@@ -298,8 +298,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate);
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate,communityId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -332,6 +333,18 @@
    @PostMapping("/population/page")
    public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
        return comMngPopulationService.pagePopulation(comMngPopulationVO);
    }
    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/population/selectByIdCard")
    public R selectByIdCard(@RequestParam("idCard") String idCard){
        ComMngPopulationDO comMngPopulationDO=comMngPopulationService.getPopulationByCardNo(idCard);
        if(comMngPopulationDO!=null){
            return R.ok(comMngPopulationDO.getAddress());
        }
        return R.fail();
    }
    /**
@@ -675,6 +688,17 @@
    public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
        return comMngPopulationService.specialInputUser(pageInputUserDTO);
    }
    /**
     * 导出特殊群体
     *
     * @param pageInputUserDTO
     *            请求参数
     * @return 特殊群体列表
     */
    @PostMapping("/special/export")
    public R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO) {
        return comMngPopulationService.specialInputUserExport(pageInputUserDTO);
    }
    /**
     * 删除特殊群体人员
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -277,8 +278,8 @@
                        });
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer participantMax = comActActivityVO1.getParticipantMax();
                    if (participantMax.intValue() == 0) {
                    Integer volunteerMax = comActActivityVO1.getVolunteerMax();
                    if (volunteerMax.intValue() != 0) {
                        comActActivityVO1.setType(1);
                    } else {
                        comActActivityVO1.setType(2);
@@ -380,6 +381,7 @@
        //活动报名名单
        ActivitySignVO activitySignVO = new ActivitySignVO();
        activitySignVO.setActivityId(activityId);
        activitySignVO.setStatus(1);
        R r = comActActivityService.listActivitySigns(activitySignVO);
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS =
@@ -1386,8 +1388,9 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId) {
        return comActActivityService.listActivity(userId);
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comActActivityService.listActivity(userId, status);
    }
    /**
@@ -2288,6 +2291,16 @@
    }
    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    public R getWestCommunityLists() {
        return comActService.getWestCommunityLists();
    }
    /**
     * 随手拍发放奖励
     * 
     * @param grantRewardDTO
@@ -2456,4 +2469,57 @@
    public R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.pageMicroWishAdmin(comActMicroWishVO);
    }
    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
     */
    @GetMapping("activity/sign-in/list")
    public R listSignInRecord(@RequestParam("id") Long id) {
        return comActActivityService.listSignInRecord(id);
    }
    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @GetMapping("activity/regist/list")
    public R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId) {
        return comActActivityService.listRegistRecord(id, userId);
    }
    /**
     * 获取活动类型(目前只有志愿者活动需要获取)
     * @param communityId
     * @param type
     * @return
     */
    @GetMapping("activity/type/list")
    public R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
        return comActActivityService.listActivityType(communityId, type);
    }
    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    @PostMapping("activity/type/add")
    public R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO) {
        return comActActivityService.addActivityType(comActActivityTypeVO);
    }
    /**
     * 我的评价
     * @param userId
     * @param activityId 活动id
     * @return
     */
    @GetMapping("activity/my-evaluate")
    public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
        return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -302,6 +302,17 @@
    }
    /**
     * 导出高龄认证记录 exportElderAuthRecords  导出高龄认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/export")
    public R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
        return comElderAuthRecordsService.export(pageElderAuthRecordsDTO);
    }
    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
@@ -378,6 +389,25 @@
    }
    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return comElderAuthRecordsService.add(comElderAuthRecordVO);
    }
    /**
     * 养老认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        return comPensionAuthRecordService.add(comElderAuthRecordVO);
    }
    /**
     * 导出养老认证记录 exportPensionAuthRecordsStatistic  导出养老认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseFileApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.RentingHourseFile;
import com.panzhihua.service_community.service.RentingHourseFileService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-涉及的文件表(RentingHourseFile)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:46:20
 */
@RestController
@RequestMapping("rentingHourseFile")
public class RentingHourseFileApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseFileService rentingHourseFileService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHourseFileService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.rentingHourseFileService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHourseFile 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHourseFile rentingHourseFile) {
        return R.ok(this.rentingHourseFileService.save(rentingHourseFile));
    }
    /**
     * 修改数据
     *
     * @param rentingHourseFile 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseFile rentingHourseFile) {
        return R.ok(this.rentingHourseFileService.updateById(rentingHourseFile));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHourseFileService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseLabelApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.RentingHourseLabel;
import com.panzhihua.service_community.service.RentingHourseLabelService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-房源标签(RentingHourseLabel)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:46:39
 */
@RestController
@RequestMapping("rentingHourseLabel")
public class RentingHourseLabelApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseLabelService rentingHourseLabelService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHourseLabelService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.rentingHourseLabelService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHourseLabel 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHourseLabel rentingHourseLabel) {
        return R.ok(this.rentingHourseLabelService.save(rentingHourseLabel));
    }
    /**
     * 修改数据
     *
     * @param rentingHourseLabel 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseLabel rentingHourseLabel) {
        return R.ok(this.rentingHourseLabelService.updateById(rentingHourseLabel));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHourseLabelService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseOrderApi.java
New file
@@ -0,0 +1,116 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.service_community.entity.RentingHourseOrder;
import com.panzhihua.service_community.service.RentingHourseOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:46:57
 */
@RestController
@RequestMapping("rentingHourseOrder")
public class RentingHourseOrderApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseOrderService rentingHourseOrderService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHourseOrderService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.rentingHourseOrderService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHourseOrderVO rentingHourseOrder) {
        return this.rentingHourseOrderService.createOrder(rentingHourseOrder);
    }
    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseOrderVO rentingHourseOrdervo) {
        RentingHourseOrder rentingHourseOrder=new RentingHourseOrder();
        BeanUtils.copyProperties(rentingHourseOrdervo,rentingHourseOrder);
        return R.ok(this.rentingHourseOrderService.updateById(rentingHourseOrder));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHourseOrderService.removeById(id));
    }
    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @PostMapping("/wxNotify")
    public R wxNotify(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO){
        return this.rentingHourseOrderService.wxPayNotify(wxPayNotifyOrderVO);
    }
    /**
     * 支付付款
     */
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody WxPayOrderVO wxPayOrderVO){
        return this.rentingHourseOrderService.wxPay(wxPayOrderVO);
    }
    /**
     * 订单统计
     */
    @PostMapping("/statics")
    public R statics(@RequestBody RentingHourseOrderVO rentingHourseOrderVO){
        return this.rentingHourseOrderService.statics(rentingHourseOrderVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePayingOrderApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.RentingHoursePayingOrder;
import com.panzhihua.service_community.service.RentingHoursePayingOrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-支付流水记录表(RentingHoursePayingOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:47:17
 */
@RestController
@RequestMapping("rentingHoursePayingOrder")
public class RentingHoursePayingOrderApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHoursePayingOrderService rentingHoursePayingOrderService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHoursePayingOrderService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.rentingHoursePayingOrderService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHoursePayingOrder 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHoursePayingOrder rentingHoursePayingOrder) {
        return R.ok(this.rentingHoursePayingOrderService.save(rentingHoursePayingOrder));
    }
    /**
     * 修改数据
     *
     * @param rentingHoursePayingOrder 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHoursePayingOrder rentingHoursePayingOrder) {
        return R.ok(this.rentingHoursePayingOrderService.updateById(rentingHoursePayingOrder));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHoursePayingOrderService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePreOrderApi.java
New file
@@ -0,0 +1,99 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import com.panzhihua.service_community.service.RentingHoursePreOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:47:54
 */
@RestController
@RequestMapping("rentingHoursePreOrder")
public class RentingHoursePreOrderApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHoursePreOrderService rentingHoursePreOrderService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHoursePreOrderService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.rentingHoursePreOrderService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        return rentingHoursePreOrderService.createOrder(rentingHoursePreOrderVO);
    }
    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        RentingHoursePreOrder rentingHoursePreOrder=new RentingHoursePreOrder();
        BeanUtils.copyProperties(rentingHoursePreOrderVO,rentingHoursePreOrder);
        return R.ok(this.rentingHoursePreOrderService.updateById(rentingHoursePreOrder));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHoursePreOrderService.removeById(id));
    }
    /**
     * 订单统计
     */
    @PostMapping("/statics")
    public R statics(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO){
        return this.rentingHoursePreOrderService.statics(rentingHoursePreOrderVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRefundOrderApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.RentingHourseRefundOrder;
import com.panzhihua.service_community.service.RentingHourseRefundOrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-退款流水记录表(RentingHourseRefundOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:48:15
 */
@RestController
@RequestMapping("rentingHourseRefundOrder")
public class RentingHourseRefundOrderApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseRefundOrderService rentingHourseRefundOrderService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHourseRefundOrderService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.rentingHourseRefundOrderService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHourseRefundOrder 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHourseRefundOrder rentingHourseRefundOrder) {
        return R.ok(this.rentingHourseRefundOrderService.save(rentingHourseRefundOrder));
    }
    /**
     * 修改数据
     *
     * @param rentingHourseRefundOrder 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseRefundOrder rentingHourseRefundOrder) {
        return R.ok(this.rentingHourseRefundOrderService.updateById(rentingHourseRefundOrder));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHourseRefundOrderService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRegisterApi.java
New file
@@ -0,0 +1,118 @@
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.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.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.RentingHourseRegisterService;
/**
 * 房屋租售-租赁房屋登记(RentingHourseRegister)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:49:08
 */
@RestController
@RequestMapping("/rentingHourseRegister")
public class RentingHourseRegisterApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseRegisterService rentingHourseRegisterService;
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/page")
    public R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO) {
        return rentingHourseRegisterService.pageRentingHouse(pageRegisterDTO);
    }
    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/register")
    public R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO) {
        return rentingHourseRegisterService.registerRentingHouse(registerDTO);
    }
    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/update")
    public R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO) {
        return rentingHourseRegisterService.updateRentingHouse(registerDTO);
    }
    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @PutMapping("/releaseOrCancel")
    public R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO) {
        return rentingHourseRegisterService.releaseOrCancelHouse(releaseOrCancelHouseDTO);
    }
    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteRentingHouse(@RequestParam("registerId") Long registerId) {
        return rentingHourseRegisterService.deleteRentingHouse(registerId);
    }
    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @GetMapping("/get")
    public R getRentingHouse(@RequestParam("registerId") Long registerId) {
        return rentingHourseRegisterService.getRentingHouse(registerId);
    }
    /**
     * 附近的房源
     */
    @PostMapping("/nearby")
    public R nearby(@RequestBody NearbyDTO nearbyDTO){
        return rentingHourseRegisterService.nearby(nearbyDTO);
    }
    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/houseList")
    public R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO) {
        return rentingHourseRegisterService.pageRentingHouseApplet(pageRegisterDTO);
    }
    @GetMapping("/updateAllHouseUnionAppCode")
    public void updateAllHouseUnionAppCode() {
        rentingHourseRegisterService.updateAllHouseUnionAppCode();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseReturnOrderApi.java
New file
@@ -0,0 +1,86 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.RentingHourseReturnOrder;
import com.panzhihua.service_community.service.RentingHourseReturnOrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 房屋租赁-房屋退租申请表(RentingHourseReturnOrder)表控制层
 *
 * @author makejava
 * @since 2021-11-23 10:49:38
 */
@RestController
@RequestMapping("rentingHourseReturnOrder")
public class RentingHourseReturnOrderApi {
    /**
     * 服务对象
     */
    @Resource
    private RentingHourseReturnOrderService rentingHourseReturnOrderService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.rentingHourseReturnOrderService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.rentingHourseReturnOrderService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param rentingHourseReturnOrder 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody RentingHourseReturnOrder rentingHourseReturnOrder) {
        return R.ok(this.rentingHourseReturnOrderService.save(rentingHourseReturnOrder));
    }
    /**
     * 修改数据
     *
     * @param rentingHourseReturnOrder 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody RentingHourseReturnOrder rentingHourseReturnOrder) {
        return R.ok(this.rentingHourseReturnOrderService.updateById(rentingHourseReturnOrder));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.rentingHourseReturnOrderService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHousesContractConfigApi.java
New file
@@ -0,0 +1,61 @@
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.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.RentingHourseContractConfigService;
/**
 * @title: RentingHousesContractConfigApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description:
 * @author: hans
 * @date: 2021/11/23 13:32
 */
@RestController
@RequestMapping("/rentingHousesConfig")
public class RentingHousesContractConfigApi {
    @Resource
    private RentingHourseContractConfigService rentingHourseContractConfigService;
    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @PostMapping("/page")
    public R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO) {
        return rentingHourseContractConfigService.pageRentingHousesConfig(pageRentingHousesConfigDTO);
    }
    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @PutMapping("/update")
    public R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO) {
        return rentingHourseContractConfigService.updateRentingHousesConfig(rentingHousesConfigDTO);
    }
    /**
     * 获取房屋租赁配置
     * @return
     */
    @GetMapping("/getConfig")
    public R getRentingHouseConfig(@RequestParam("type") Integer type) {
        return rentingHourseContractConfigService.getRentingHouseConfig(type);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
New file
@@ -0,0 +1,121 @@
package com.panzhihua.service_community.config;
import org.springframework.amqp.core.*;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.HashMap;
import java.util.Map;
@Configuration
public class RabbitmqConfig {
    public static final String PreOrder_QUEUE="preOrder.queue";
    public static final String PreOrder_ROUTING_KEY="preOrder.key";
    public static final String PreOrder_EXCHANGE="preOrder.exchange";
    public static final String Order_QUEUE="order.queue";
    public static final String Order_ROUTING_KEY="order.key";
    public static final String Order_EXCHANGE="order.exchange";
    @Bean
    public Queue preOrderQueue(){
        return new Queue(PreOrder_QUEUE,true,false,false,null);
    }
    @Bean
    public Exchange preOrderExchange(){
        Map<String, Object> arguments = new HashMap<>();
        arguments.put("x-delayed-type", ExchangeTypes.DIRECT);
        return new CustomExchange(PreOrder_EXCHANGE,"x-delayed-message",true,false,arguments);
    }
    @Bean
    public Binding preOrderBinding(){
        return BindingBuilder.bind(preOrderQueue()).to(preOrderExchange()).with(PreOrder_ROUTING_KEY).noargs();
    }
    @Bean
    public Queue orderQueue(){
        return new Queue(Order_QUEUE,true,false,false,null);
    }
    @Bean
    public Exchange orderExchange(){
        Map<String, Object> arguments = new HashMap<>();
        arguments.put("x-delayed-type", ExchangeTypes.DIRECT);
        return new CustomExchange(Order_EXCHANGE,"x-delayed-message",true,false,arguments);
    }
    @Bean
    public Binding orderBinding(){
        return BindingBuilder.bind(orderQueue()).to(orderExchange()).with(Order_ROUTING_KEY).noargs();
    }
    public Queue directQueue() {
        // durable:是否持久化,默认是false,持久化队列:会被存储在磁盘上,当消息代理重启时仍然存在,暂存队列:当前连接有效
        // exclusive:默认也是false,只能被当前创建的连接使用,而且当连接关闭后队列即被删除。此参考优先级高于durable
        // autoDelete:是否自动删除,当没有生产者或者消费者使用此队列,该队列会自动删除。
        //   return new Queue("TestDirectQueue",true,true,false);
        //一般设置一下队列的持久化就好,其余两个就是默认false
        return new Queue("directQueue",true);
    }
    //Direct交换机 起名:TestDirectExchange
    @Bean
    DirectExchange directExchange() {
        //  return new DirectExchange("TestDirectExchange",true,true);
        return new DirectExchange("directExchange",true,false);
    }
    //绑定  将队列和交换机绑定, 并设置用于匹配键:TestDirectRouting
    @Bean
    Binding bindingDirect() {
        return BindingBuilder.bind(directQueue()).to(directExchange()).with("directRouting");
    }
    public Queue pushQueue() {
        // durable:是否持久化,默认是false,持久化队列:会被存储在磁盘上,当消息代理重启时仍然存在,暂存队列:当前连接有效
        // exclusive:默认也是false,只能被当前创建的连接使用,而且当连接关闭后队列即被删除。此参考优先级高于durable
        // autoDelete:是否自动删除,当没有生产者或者消费者使用此队列,该队列会自动删除。
        //   return new Queue("TestDirectQueue",true,true,false);
        //一般设置一下队列的持久化就好,其余两个就是默认false
        return new Queue("pushQueue",true);
    }
    //Direct交换机 起名:TestDirectExchange
    @Bean
    DirectExchange pushExchange() {
        //  return new DirectExchange("TestDirectExchange",true,true);
        return new DirectExchange("PUSH_Exchange",true,false);
    }
    //绑定  将队列和交换机绑定, 并设置用于匹配键:TestDirectRouting
    @Bean
    Binding bindingPush() {
        return BindingBuilder.bind(directQueue()).to(directExchange()).with("PUSH_ROUTING");
    }
    @Bean
    DirectExchange lonelyDirectExchange() {
        return new DirectExchange("lonelyDirectExchange");
    }
    @Bean
    public MessageConverter messageConverter(){
        return new Jackson2JsonMessageConverter();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java
@@ -60,7 +60,7 @@
    @Select("<script> " + "  SELECT   " + " SUM(CASE TYPE WHEN 1 THEN total ELSE 0 END) as 'orgCount',  "
        + " SUM(CASE TYPE WHEN 2 THEN total ELSE 0 END) as 'memberCount',  "
        + " SUM(CASE TYPE WHEN 3 THEN total ELSE 0 END) as 'activityCount',  "
        + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount'  " + " FROM (  "
        + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount',SUM(CASE TYPE WHEN 5 THEN total ELSE 0 END) as 'committeeCount'  " + " FROM (  "
        + " SELECT 1 AS TYPE , COUNT(id) total  " + " FROM com_pb_org org   "
        + " WHERE org.community_id  = #{communityId} AND STATUS=1  " + " UNION ALL   "
        + " SELECT 2 AS TYPE , COUNT(id) total  " + " FROM  com_pb_member   "
@@ -68,7 +68,9 @@
        + " SELECT 3 AS TYPE , COUNT(id) total  " + " FROM  com_pb_activity  "
        + " WHERE community_id  = #{communityId} AND STATUS IN (2,3,4,5)  " + " UNION ALL   "
        + " SELECT 4 AS TYPE , COUNT(id) total  " + " FROM  com_pb_dyn   "
        + " WHERE community_id  = #{communityId} AND TYPE = 1  " + ") t" + "</script>")
        + " WHERE community_id  = #{communityId} AND TYPE = 1  UNION ALL " +
            "select 5 AS TYPE,count(id) total      from com_pb_member_role " +
            "where community_id =#{communityId}" + ") t" + "</script>")
    BigScreenStatisticPartyBuild partybuild(@Param("communityId") Long communityId);
    @Select("<script> " + " SELECT pm.id, pm.member_id, pm.user_id, pm.name, " + " case "
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActEvaluateDAO.java
@@ -44,4 +44,11 @@
     */
    ComActActEvaluateVO getEvaluateListByUserId(@Param("activityId") Long activityId,@Param("userId") Long userId);
    /**
     * 查询某活动的用户评价列表
     * @param activityId
     * @param userId
     * @return
     */
    List<ComActActEvaluateVO> selectEvaluateList(@Param("activityId") Long activityId, @Param("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java
@@ -29,4 +29,20 @@
    List<ComActActRegistExcelVO> getRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);
    List<ComActActRegistExcelVO> getNoRegistLists(@Param("comActActRegistVO") ComActActRegistVO comActActRegistVO);
    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);
    /**
     * 获取总积分奖励
     * @param activityId
     * @param userId
     * @return
     */
    Integer selectTotalAwardWithRegist(@Param("activityId") Long activityId, @Param("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
import com.panzhihua.common.model.vos.community.ComActActSignExcelVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -25,31 +26,35 @@
@Mapper
public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
    // 居民 党员 志愿者 1 2 3
    @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer  " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  " + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
        + "AND u.phone = #{activitySignVO.phone}  " + " </if> "
        + "<if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>"
        + "AND u.tags like concat('%',#{activitySignVO.tags},'%')   " + " </if> "
        + "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>"
        + "AND u.`name` = #{activitySignVO.name}  " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>"
        + "AND u.is_partymember = 0 and a.is_volunteer=0  " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>"
        + "AND u.is_partymember = 1    " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>"
        + "AND a.is_volunteer=1   " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
//    @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
//        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
//        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.times ,a.reason,a.award,t.limit " + "FROM " + "com_act_act_sign a "
//        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id" + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
//        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
//        + "AND u.phone = #{activitySignVO.phone}  " + " </if> "
//        + "<if test='activitySignVO.status != null'>"
//        + "AND a.status = #{activitySignVO.status}  " + " </if> "
//        + "<if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>"
//        + "AND u.tags like concat('%',#{activitySignVO.tags},'%')   " + " </if> "
//        + "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>"
//        + "AND u.`name` = #{activitySignVO.name}  " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>"
//        + "AND u.is_partymember = 0 and a.is_volunteer=0  " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>"
//        + "AND u.is_partymember = 1    " + " </if> "
//        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>"
//        + "AND a.is_volunteer=1   " + " </if> " + "<if test='activitySignVO.type != null and activitySignVO.type != 0'>"
//        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
    IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);
    @Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.openid, " + "a.create_at,  " + "a.is_volunteer  " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  " + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, u.openid, "
        + "CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.reason, t.limit " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
        + "AND u.phone = #{activitySignVO.phone}  " + " </if> "
        + "<if test='activitySignVO.status != null'>"
        + "AND a.status = #{activitySignVO.status}  " + " </if> "
        + "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>"
        + "AND u.`name` = #{activitySignVO.name}  " + " </if> "
        + "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>"
@@ -63,8 +68,8 @@
    List<ComActActSignExcelVO> getSignLists (@Param("activitySignVO") ActivitySignVO activitySignVO);
    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE " + "  WHEN su.is_volunteer = 1 THEN "
        + "  '志愿者' ELSE '居民'  " + " END identity, " + " su.phone, " + " caas.create_at  " + "FROM "
    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE WHEN caas.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + " su.phone, " + " caas.create_at  " + "FROM "
        + " com_act_act_sign AS caas "
        + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id where caas.activity_id = #{activityPeopleListDTO.activityId} "
        + "<if test='activityPeopleListDTO.phone != null and activityPeopleListDTO.phone != &quot;&quot;'>"
@@ -85,4 +90,18 @@
     * @return 需要默认好评的记录列表
     */
    List<ComActActSignDO> selectNeedEvaluateSignRecords(@Param("activityIds") List<Long> activityIds);
    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    List<ActivitySignInRecordVO> listSignInRecord(@Param("id") Long id);
    /**
     * 获取用户活动报名记录
     * @param userId
     * @return
     */
    List<ActivitySignVO> selectList(@Param("userId") Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityCodeDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActActivityCode;
/**
 * 签到二维码表(ComActActivityCode)表数据库访问层
 *
 * @author makejava
 * @since 2021-10-15 15:23:09
 */
@Mapper
public interface ComActActivityCodeDao extends BaseMapper<ComActActivityCode> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -5,6 +5,7 @@
import java.util.Map;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -44,7 +45,7 @@
        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
        + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.participant_max, " + "a.sign_up_begin, "
        + "a.sign_up_end, " + "ca.name as communityName  " + "FROM " + "com_act_activity a  "
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join com_act_act_sign s on a.id=s.activity_id  "
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "left join com_act ca on a.community_id=ca.community_id  " + " where 1=1 " +
        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id=#{comActActivityVO.communityId} " + " </if> "
@@ -61,23 +62,29 @@
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
        + "AND a.volunteer_max!=0  " + " </if> "
        + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.participant_max!=0  "
        + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0  "
        + " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
    IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
    @Select("SELECT  " + "u.name sponsorName, " + "ca.name communityName, "
        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
        + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.*  " + "FROM  " + "com_act_activity a  "
        + "left join sys_user u on a.sponsor_id=u.user_id  " + "left join com_act_act_sign s on a.id=s.activity_id  "
        + "left join com_act ca on a.community_id=ca.community_id  " + "where a.id=#{id}  " + " group by a.id ")
    ComActActivityVO inforActivity(Long id);
//    @Select("SELECT  " + "u.name sponsorName, " + "ca.name communityName, "
//        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
//        + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.*  " + "FROM  " + "com_act_activity a  "
//        + "left join sys_user u on a.sponsor_id=u.user_id  " + "left join com_act_act_sign s on a.id=s.activity_id  "
//        + "left join com_act ca on a.community_id=ca.community_id  " + "where a.id=#{id}  " + " group by a.id ")
    @Select("SELECT " + "a.*  " + "FROM " + "com_act_act_sign s " + "JOIN com_act_activity a ON s.activity_id = a.id  "
    /**
     * 活动详情
     * @param id
     * @return
     */
    ComActActivityVO inforActivity(@Param("id") Long id);
    @Select("SELECT " + "a.*  " + "FROM " + "(select * from com_act_act_sign where `status` = 1) s " + "JOIN com_act_activity a ON s.activity_id = a.id  "
        + "WHERE " + "s.user_id = #{comActActivityVO.sponsorId}  " + "ORDER BY " + "s.create_at DESC")
    IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
    @Select("select " + "t.activity_name," + "t.id," + "t.end_at," + "t.begin_at," + "t.cover," + "t.status "
        + "from com_act_act_sign s  "
        + "from (select * from com_act_act_sign where `status` = 1) s  "
        + "join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 "
        + "join com_act_activity t on s.activity_id=t.id and t.status=5")
    List<ComActActivityVO> listActivityByPhone(String phone);
@@ -85,7 +92,7 @@
    @Select("select t.id from ( " + "SELECT  " + "a.id, " + "a.activity_name, "
        + "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum, "
        + "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum, " + "a.participant_min, "
        + "a.volunteer_min " + "FROM " + "com_act_activity a  " + "LEFT JOIN com_act_act_sign s on a.id=s.activity_id  "
        + "a.volunteer_min " + "FROM " + "com_act_activity a  " + "LEFT JOIN (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "WHERE " + "a.`status` in(3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),a.sign_up_end)<=0 "
        + "GROUP BY a.id)t WHERE t.usernum<participant_min or t.volunteernum<volunteer_min")
    List<Long> selectTimedTaskActActivity();
@@ -104,33 +111,38 @@
    @Update("update com_act_activity set `status`=5 where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),end_at)<=0")
    int updateStatusToBeginActiveOrEnd();
    @Select("<script> " + "select t.* from ( " + "SELECT  " + "a.id, " + "a.activity_name, " + "u.`name` sponsorName, "
        + "a.activity_addr, " + "a.participant_max, " + "count(if(s.is_volunteer=1,null,s.id))participant_now, "
        + "a.volunteer_max, " + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, "
        + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, " + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM "
        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
        + "AND a.`status` = 99  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + "group by a.id " + "  " + " union all " + "select t1.* from ( " + "  " + " SELECT  " + "a.id, "
        + "a.activity_name, " + "u.`name` sponsorName, " + "a.activity_addr, " + "a.participant_max, "
        + "count(if(s.is_volunteer=1,null,s.id))participant_now, " + "a.volunteer_max, "
        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, " + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, "
        + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM " + " com_act_activity a  "
        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
        + "AND a.`status` = #{comActActivityVO.status}  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + " group by a.id order by a.publish_at desc)t1 )t" + "</script>")
    IPage<ComActActivityVO> pageActivityCommunityBack(Page page,
        @Param("comActActivityVO") ComActActivityVO comActActivityVO);
//    @Select("<script> " + "select t.* from ( " + "SELECT  " + "a.id, " + "a.activity_name, " + "u.`name` sponsorName, "
//        + "a.activity_addr, " + "a.participant_max, " + "count(if(s.is_volunteer=1,null,s.id))participant_now, "
//        + "a.volunteer_max, " + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, "
//        + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, " + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM "
//        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
//        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
//        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
//        + "AND a.`status` = 99  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
//        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
//        + " </if> " + "group by a.id " + "  " + " union all " + "select t1.* from ( " + "  " + " SELECT  " + "a.id, "
//        + "a.activity_name, " + "u.`name` sponsorName, " + "a.activity_addr, " + "a.participant_max, "
//        + "count(if(s.is_volunteer=1,null,s.id))participant_now, " + "a.volunteer_max, "
//        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, " + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, "
//        + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM " + " com_act_activity a  "
//        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
//        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
//        + "AND a.`status` = #{comActActivityVO.status}  " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
//        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
//        + " </if> " + " group by a.id order by a.publish_at desc)t1 )t" + "</script>")
    /**
     * 分页查询社区活动
     * @param page
     * @param comActActivityVO
     * @return
     */
    IPage<ComActActivityVO> pageActivityCommunityBack(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
    @Select("select id from com_act_activity where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),end_at)<=0")
    List<Long> getActivityEndIds();
@@ -158,8 +170,8 @@
    @Select("SELECT " + " count( caa.id ) as totalNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min = 0 and community_id = #{communityId}) as commonNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min > 0 and community_id = #{communityId}) as volunteerNum, "
        + " (select count(caas.user_id) from com_act_act_sign as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = #{communityId}) as commonPeopleNum, "
        + " (select count(caas.user_id) from com_act_act_sign as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = #{communityId}) as volunteerPeopleNum, "
        + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = #{communityId}) as commonPeopleNum, "
        + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = #{communityId}) as volunteerPeopleNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and community_id = #{communityId} and create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now()) as currentNum "
        + "FROM " + " com_act_activity AS caa  " + "WHERE "
        + " caa.`status` IN (1,2,3,4,5) and community_id = #{communityId}")
@@ -190,9 +202,9 @@
        @Param("actActivityListDTO") ScreenActActivityListDTO actActivityListDTO);
    @Select("SELECT " + " count( caas.id ) AS volunteerCount,( " + " SELECT " + "  count( caas1.id )  " + " FROM "
        + "  com_act_act_sign AS caas1 " + "  LEFT JOIN sys_user AS su1 ON su1.user_id = caas1.user_id  " + " WHERE "
        + "  (select * from com_act_act_sign where `status` = 1) AS caas1 " + "  LEFT JOIN sys_user AS su1 ON su1.user_id = caas1.user_id  " + " WHERE "
        + "  su1.is_volunteer = 0  " + "  AND caas1.activity_id = #{activityId}  " + " ) AS participantCount  "
        + "FROM " + " com_act_act_sign AS caas " + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id  " + "WHERE "
        + "FROM " + " (select * from com_act_act_sign where `status` = 1) AS caas " + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id  " + "WHERE "
        + " su.is_volunteer = 1  " + " AND activity_id = #{activityId} ")
    ActActivityListVO getScreenActActivityPeopleCount(@Param("activityId") Long activityId);
@@ -204,4 +216,19 @@
     * @return 活动列表
     */
    List<ComActActivityVO> getIndexTopActivityList(@Param("communityId") Long communityId);
    /**
     * 获取活动类型(目前只有志愿者活动需要获取)
     * @param communityId
     * @param type
     * @return
     */
    List<ComActActivityTypeVO> listActivityType(@Param("communityId") Long communityId, @Param("type") Integer type);
    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    int addActivityType(@Param("comActActivityTypeVO") ComActActivityTypeVO comActActivityTypeVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAnnouncementDao.java
New file
@@ -0,0 +1,27 @@
package com.panzhihua.service_community.dao;
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import org.apache.ibatis.annotations.Param;
/**
 * (ComActAnnouncement)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-01 13:45:54
 */
@Mapper
public interface ComActAnnouncementDao extends BaseMapper<ComActAnnouncement> {
    /**
     * 分页查询通知公告
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActAnnouncementVO> pageList(Page page,@Param("commonPage") CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
@@ -12,7 +12,7 @@
 * 分类列表(ComActColumn)表数据库访问层
 *
 * @author makejava
 * @since 2021-10-20 17:28:12
 * @since 2021-11-01 14:38:25
 */
@Mapper
public interface ComActColumnDao extends BaseMapper<ComActColumn> {
@@ -22,5 +22,6 @@
     * @param commonPage
     * @return
     */
    IPage<ComActColumn> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,7 +63,7 @@
    void updateAccountPassword(@Param("password") String password, @Param("account") String account,
        @Param("communityId") Long communityId);
    @Select("select community_id,`name` from com_act where state = 0")
    @Select("select community_id,`name`,lng,lat from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();
    @Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
@@ -72,19 +73,28 @@
        + "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")
    @Select("select `name`,street_id from com_street where area_code = '510423'")
    List<StreetAllAppletsVO> getStreetList();
    @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);
    @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\n"
        + " where ca.state = 0 and ca.name like concat('%',#{name},'%')")
    @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.name like '%%' and cs.area_code = '510423'")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name);
    @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 "
        + " HAVING distance >= 0 and distance <= #{communityDTO.distance} " + "ORDER BY " + " distance ASC")
    @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 = '510423' " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
    @Select("select community_id,name,lng,lat from com_act  where state = 0 and area_code = '510423' ")
    List<EventGridCommunityAdminVO> getWestCommunityLists();
    @Select("select account,plaintext_password as password from com_act where community_id = #{communityId}")
    ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
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;
@@ -152,17 +153,7 @@
        + "WHERE " + "d.id =#{id} " + "GROUP BY d.id")
    ComActDiscussVO selectHaveSignAndHaveVote(@Param("id") Long id, @Param("loginUserId") Long loginUserId);
    @Select(" SELECT COUNT(id) AS totalNum,"
        + "(SELECT COUNT(id)  FROM com_act_discuss WHERE community_id = #{communityId} AND create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now())AS currentNum,"
        + "(SELECT COUNT(id)  FROM com_act_discuss WHERE community_id = #{communityId} AND TYPE = 1)AS imgNum," + "("
        + "SELECT " + " count(distinct cadc.user_id) " + "FROM " + " com_act_discuss_comment AS cadc "
        + " LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id "
        + " where cad.type = 1 and cad.community_id = #{communityId} " + ")AS imgPeopleNum," + "("
        + "select count(user_id) from ( " + "SELECT " + " distinct cadc.user_id " + "FROM "
        + " com_act_discuss_comment AS cadc " + " LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id "
        + " where cad.type = 2 and cad.community_id = #{communityId} " + " union all "
        + " SELECT DISTINCT cadou.user_id  FROM com_act_discuss_option_user AS cadou LEFT JOIN com_act_discuss_option AS cado ON cado.id = cadou.discuss_option_id left join com_act_discuss as cad on cad.id = cado.discuss_id where cad.community_id = #{communityId}"
        + ") t" + ")AS votePeopleNum " + " FROM com_act_discuss")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("date") String date);
    @Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = #{communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
@@ -219,4 +210,20 @@
     * @return
     */
    int batchUpdateViewNum(@Param("needDealMap") HashMap<Long, Integer> needDealMap);
    /**
     * 居民自治-议事投票类型占比统计
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectTypePercent(@Param("communityId") Long communityId);
    /**
     * 获取一起议标题
     * @param type
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getTitles(@Param("type") int type, @Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -1,7 +1,10 @@
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;
@@ -23,10 +26,10 @@
 **/
@Mapper
public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "COUNT(u.id)readNum, " + "d.`status`, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, " + "d.is_topping, " + "d.publish_at, "
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "IFNULL(u.readNum,0) readNum, " + "d.`status`, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, d.jump_url,d.jump_type, " + "d.is_topping, " + "d.publish_at, "
        + "d.create_at, " + "cadt.`name` as typeName, " + "cadt.color as typeColor, " + "ca.name as communityName  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN ( select dyn_id,count(id) as readNum from com_act_dyn_user GROUP BY dyn_id  )  u ON d.id = u.dyn_id  "
        + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
        + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE 1=1  "
        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id=#{comActDynVO.communityId} " + " </if> "
@@ -73,4 +76,12 @@
        + " FROM DUAL")
    DynamicWorkVO countByTime(@Param("start") String start, @Param("end") String end,
        @Param("communityId") Long communityId);
    List<StatisticsCommVO> getIndexDynBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getDynAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getDynTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    IPage<ComActDynVO> indexDynList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -3,9 +3,16 @@
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.easyPhoto.ExportEasyPhotoDTO;
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.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO;
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.easyPhoto.BannerVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO;
@@ -350,4 +357,56 @@
     * @return  社区待处理随手拍id集合
     */
    List<Long> easyPhotoNoHandleIds(@Param("communityId")Long communityId);
    /**
     *  查询banner
     * @param communityId
     * @return
     */
    List<BannerVO>  banner(@Param("communityId") Long communityId);
    /**
     * 获取随手拍居民自治统计数据
     * @param communityId
     * @return
     */
    List<ComActEasyPhotoVO> selectStatisticsList(@Param("communityId") Long communityId);
    /**
     * 获取居民自治统计数据
     * @param communityId
     * @return
     */
    ResidentAutonomyStatisticsVO selectResidentAutonomyStatistics(@Param("communityId") Long communityId);
    /**
     * 获取清网治格统计数据
     * @param communityId
     * @return
     */
    GridsGovernanceStatisticsVO selectGridsGovernance(@Param("communityId") Long communityId);
    /**
     * 首页大屏获取网格统计数据
     */
    BigscreenGridsGovernanceStatisticsVO selectBigscreenGridsGovern(@Param("communityId")Long communityId);
    /**
     * 首页二级页面-随手拍基础数据查询
     * @param communityId
     * @return
     */
    BigScreenEasyPhotoStatisticsInfo selectIndexEasyPhotoBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getEasyPhotoAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getEasyPhotoTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    /**
     * 首页二级页面-随手拍展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralUserMapper.java
@@ -54,11 +54,11 @@
        @Param("communityRankDTO") ComActIntegralCommunityRankDTO communityRankDTO);
    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    List<ComActActivityPeopleVO> getTaskActivityPeopleList(@Param("activityId") Long activityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -3,9 +3,12 @@
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.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
@@ -246,4 +249,38 @@
    List<SysUserVO> getWishHandleListAdmin(@Param("type") Integer type,@Param("communityId") Long communityId);
    SysUserVO getUserByUserId(@Param("userId") Long userId);
    /**
     * 待实现&已实现数目及占比
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectRealizePercent(@Param("communityId") Long communityId);
    /**
     * 获取通过的微心愿图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getPassedAllImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    /**
     * 首页二级页面-微心愿基础数据查询
     * @param communityId
     * @return
     */
    BigScreenMicroWishStatisticsInfo selectIndexMicroWishBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getMicroWishAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getMicroWishTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    /**
     * 微心愿大屏展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -3,6 +3,8 @@
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;
@@ -116,4 +118,28 @@
    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/ComActPictureLibraryDAO.java
New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_community.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @title: ComActPictureLibraryDAO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 图库预设mapper
 * @author: hans
 * @date: 2021/11/23 17:05
 */
@Mapper
public interface ComActPictureLibraryDAO {
    /**
     * 获取预设图库
     * @param type
     * @param subtype
     * @return
     */
    List<String> getPresetPictureLibrary(@Param("type") Integer type, @Param("subtype") Integer subtype);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -2,6 +2,10 @@
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -125,4 +129,23 @@
        @Param("communityId") Long communityId);
    void addNoNotice(@Param("questId") Long questId, @Param("userId") Long userId);
    /**
     * 首页大屏二级页面-社区问卷基础数据
     * @param communityId
     * @return
     */
    BigScreenQuestionnaireStatisticsInfo getIndexQuestionnaireBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getQuestionnaireAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getQuestionnaireTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    /**
     * 大屏问卷展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterStatisticsVO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -35,7 +36,12 @@
     * @return  某预约登记记录列表
     */
    IPage<ComActReserveRegisterDetailedVO> pageRegisterDetailedListAdmin(Page page, @Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 导出某预约登记记录列表
     * @param detailedAdminDTO  请求参数
     * @return  某预约登记记录列表
     */
    List<ComActQuestnaireAnswerContentVO> export(@Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 查询登记记录填写的内容列表
     * @param reserveRecordId   预约登记记录id
@@ -45,4 +51,14 @@
    ComActReserveRegisterDetailedVO getRegisterDetailedById(@Param("reserveRecordId") Long reserveRecordId);
    IPage<String> pageRegisterHomeQuarantine(@Param("page") Page page, @Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    List<HomeQuarantineRegisterStatisticsVO> selectStatistics(@Param("reserveId") Long reserveId, @Param("record") String record);
    /**
     * 查询居家隔离统计身份证号码
     * @param detailedAdminDTO
     * @return
     */
    List<String> exportHomeQuarantine(@Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveMapper.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserveSub;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeLeftStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
@@ -94,4 +96,31 @@
     */
    List<ComActReserveIndexVo> getReserveIndexList(@Param("communityId") Long communityId);
    /**
     * 首页大屏返攀登记数据统计总数
     * @param communityId
     * @return
     */
    Integer indexBackReserve(@Param("communityId") Long communityId);
    /**
     * 首页大屏居家隔离数据统计总数
     * @param communityId
     * @return
     */
    Integer indexHomeQuarantine(@Param("communityId") Long communityId);
    /**
     * 首页大屏返攀登记数据统计选项
     * @param communityId
     * @return
     */
    List<IndexReserveSub> indexBackReserveSub(@Param("communityId") Long communityId);
    /**
     * 首页大屏居家隔离数据统计选项
     * @param communityId
     * @return
     */
    List<IndexReserveSub> IndexHomeQuarantineSub(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveRecordMapper.java
@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -105,4 +107,19 @@
     * @return
     */
    List<ComOperationListVO> queryAll(OperationDetailDTO operationDetailDTO);
    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    BigScreenStaticsReserve biggestScreen(@Param("communityId") Long communityId);
    /**
     * 大屏折线图
     * @param communityId
     * @param date
     * @return
     */
    BigScreenStaticsReserveMonth biggestScreenMonth(@Param("communityId")Long communityId,@Param("date")String date);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -43,7 +43,7 @@
    @Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
    ComMngVillageVO getVillageById(@Param("villageId") Long villageId);
    @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " build_sum, " + " address, "
    @Select("<script> " + "SELECT " + " village_id, " + " `name` AS userName, " + " IFNULL((select count(id) from com_mng_building where village_id = cmv.village_id),0) as buildSum, " + " address, "
        + " create_at as createAt, " + " lng, " + " lat, "
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
        + " ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmv.village_id ) AS houseNum, "
@@ -66,6 +66,9 @@
    IPage<PageComMngVillageVO> getGridVillageList(Page page,
        @Param("villageListAppDTO") ComMngVillageListAppDTO villageListAppDTO);
    IPage<PageComMngVillageVO> getGridVillageListApp(Page page,
                                                  @Param("villageListAppDTO") ComMngVillageListAppDTO villageListAppDTO);
    @Select("<script> " + "SELECT " + " alley, " + " house_num as doorNum, " + " `name` AS userName, " + " build_sum, "
        + " address, " + " create_at as createAt, "
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseDonatesDao.java
@@ -70,4 +70,28 @@
     */
    DonatesStatisticsVO selectDonatesStatistics(@Param("communityId") Long communityId, @Param("currentYear") String currentYear,
                                                @Param("currentMonth") String currentMonth, @Param("today") String today);
    /**
     * 居民自治大屏-捐赠记录
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseDonateRecords(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    /**
     * 居民自治大屏-爱心传递
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseLoveTransfer(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    /**
     * 居民自治大屏-捐赠物品图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java
New file
@@ -0,0 +1,111 @@
package com.panzhihua.service_community.dao;
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.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.service_community.model.dos.ComPbActivityDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 17:59
 **/
@Mapper
public interface ComBpActivityDAO extends BaseMapper<ComPbActivityDO> {
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")
    @Select("<script> " + "SELECT\n" + "a.id,\n" + "a.name,\n" + "a.address,\n" + "a.status,\n"
        + "a.create_at releaseTimeBegin,\n" + "a.activity_time_begin,\n" + "a.activity_time_end,\n"
        + "a.enroll_time_begin,\n" + "a.release_time,\n" + "a.enroll_time_end \n" + "FROM\n"
        + "com_pb_activity_member m\n" + "JOIN com_pb_activity a ON m.activity_id = a.id \n" + "WHERE\n"
        + "m.member_id = #{id} \n" + "<if test='name != null and name.trim() != &quot;&quot;'>"
        + "AND a.`name` like concat (#{name},'%')  \n" + " </if> " + "<if test='releaseTimeBegin != null '>"
        + "AND a.create_at BETWEEN #{releaseTimeBegin} \n" + "AND #{releaseTimeEnd} \n" + " </if> "
        + "<if test='activityTimeBegin != null '>" + "AND a.activity_time_begin BETWEEN #{activityTimeBegin} \n"
        + "AND #{activityTimeEnd}" + " </if> " + "</script>")
    List<PartyBuildingActivityVO> listPartyMemberActivities(PartyBuildingActivityVO partyBuildingActivityVO);
    @Select("<script> " + "SELECT\n" + "a.id,\n" + "a.name,\n" + "a.address,\n" + "a.status,\n" + "a.release_time,\n"
        + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
        + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
        + "left join sys_user u on a.create_by=u.user_id \n"
        + "where a.community_id=#{partyBuildingActivityVO.communityId}\n"
        + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>"
        + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
        + " and a.`status` not in(5,6) " + " </if> "
        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets ==null '>"
        + "AND a.`status` = #{partyBuildingActivityVO.status} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>"
        + "AND a.`status` in (3,4) \n" + " </if> " + "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>"
        + "AND a.release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n"
        + "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.activityTimeBegin != null '>"
        + "AND a.activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n"
        + "AND #{partyBuildingActivityVO.activityTimeEnd}" + " </if> " + "order by a.create_at desc " + "</script>")
    IPage<PartyBuildingActivityVO> pageActivity(Page page,
        @Param("partyBuildingActivityVO") PartyBuildingActivityVO partyBuildingActivityVO);
    @Select("select t.id from (\n" + "SELECT \n" + "a.participation_lowest_num,\n" + "a.name,\n" + "a.id,\n"
        + "COUNT(m.id)num\n" + "FROM\n" + "com_pb_activity a\n"
        + "LEFT JOIN com_pb_activity_member m ON a.id = m.activity_id\n"
        + "WHERE a.`status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),a.enroll_time_end)<=0\n"
        + "GROUP BY a.id)t where t.num<t.participation_lowest_num")
    List<Long> selectTimedTaskPartyBuildingActivity();
    @Select("SELECT \n" + "u.user_id\n" + "FROM\n" + "com_pb_activity_member m\n"
        + "JOIN com_pb_member r on m.member_id=r.id\n" + "join sys_user u on r.id_card=u.id_card and u.type=1 \n"
        + "where m.activity_id=#{activityId}")
    List<Long> selectTimedTaskPartyBuildingActivityUserids(Long activityId);
    @Update("<script> " + "update com_pb_activity set `status`=6 WHERE id in \n"
        + "<foreach item=\"item\" collection=\"ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
        + "#{item}\n" + "</foreach>\n" + "</script>")
    int updateBatchIds(@Param("ids") List<Long> ids);
    @Update("update com_pb_activity set status=2 where `status`=1 and TIMESTAMPDIFF(MINUTE,SYSDATE(),release_time)<=0")
    int updateStatusToNotBegin();
    @Update("update com_pb_activity set status=3 where `status`=2 and TIMESTAMPDIFF(MINUTE,SYSDATE(),enroll_time_begin)<=0")
    int updateStatusToSign();
    @Update("update com_pb_activity set status=5 where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),enroll_time_end)<=0")
    int updateStatusToActiveOrEnd();
    @Select("select id from com_pb_activity where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),enroll_time_end)<=0")
    List<Long> getTaskPbActivityEndIds();
    @Select("select caas.user_id,caas.activity_id,caa.community_id from com_pb_activity_member as caas left join com_pb_activity as caa on caa.id = caas.activity_id where caa.id = #{activityId}")
    List<ComActActivityPeopleVO> getTaskPbActivityPeopleList(@Param("activityId") Long activityId);
    @Select("select type,name from sys_user where user_id=#{createBy}")
    LoginUserInfoVO selectUserInfoByUserId(Long createBy);
    /**
     * 根据社区id查询社区名称
     *
     * @param communityId
     *            社区id
     * @return 社区名字
     */
    @Select("select name from com_act where community_id=#{communityId}")
    String selectCommunityNameByCommunityId(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthRecordsDAO.java
@@ -30,6 +30,8 @@
    IPage<ComElderAuthRecordVO> pageElderAuthRecords(Page page,
                                               @Param("pageElderAuthRecordsDTO") PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    List<ComElderAuthRecordVO> export(@Param("pageElderAuthRecordsDTO") PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    ComElderAuthRecordVO detailElderAuthRecords(@Param("authRecordId") Long authRecordId);
    List<ComElderAuthRecordExcleVO> getElderAuthRecordsByIds(@Param("ids") List<Long> ids);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -7,6 +7,10 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.BaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@@ -25,8 +29,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -117,6 +119,8 @@
        + "AND cmp.unit_no = #{comMngPopulationVO.unitNo} " + " </if> "
        + "<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != &quot;&quot;'>"
        + "AND cmp.house_no = #{comMngPopulationVO.houseNo} " + " </if> "
        + "<if test='comMngPopulationVO.isDeath != null'>"
        + "AND cmp.death = #{comMngPopulationVO.isDeath} " + " </if> "
        + "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>"
        + "AND cmp.sex = #{comMngPopulationVO.sex} " + " </if> "
        + "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot; and comMngPopulationVO.ageEndTime == null'>"
@@ -151,6 +155,13 @@
     */
    IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
    /**
     *
     * @param pageInputUserDTO
     * @return
     */
    List<InputUserInfoVO> specialInputUserExport(@Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
    @Select("<script> "
        + "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag <where> "
        + "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != &quot;&quot;'>"
@@ -180,6 +191,7 @@
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal "
        + ",(select count(DISTINCT `name`) from com_mng_village where community_id = #{communityId}) as villageTotal "
        + ",(select count(id) from com_mng_building where act_id = #{communityId}) as buildNum "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
@@ -202,13 +214,10 @@
            " where cmpct.community_id = #{communityId}")
    IndexBasicsStatisticsVO getScreenIndexByBasics(@Param("communityId") Long communityId);
    @Select("SELECT " + " IFNULL( NULL, 1 ) AS type, " + " count( cmpct.id ) AS sum  " + "FROM "
        + " com_mng_population_community_tags as cmpct  "
        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 1  "
        + " AND cmpct.community_id = #{communityId} UNION ALL " + "SELECT " + " IFNULL( NULL, 2 ) AS type, "
        + " count( cmpct.id ) AS sum  " + "FROM " + " com_mng_population_community_tags as cmpct  "
        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 2  "
        + " AND cmpct.community_id = #{communityId}")
    @Select("SELECT    cmp.sex as type,    count( cmpct.id ) AS sum,  count( cmpct.id )*100/(select count(*) from com_mng_population_community_tags as cmpct  \n" +
            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE    cmpct.community_id = #{communityId} ) as percent    FROM \n" +
            "          com_mng_population_community_tags as cmpct  \n" +
            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE cmp.sex is not null  and  cmpct.community_id = #{communityId} GROUP BY cmp.sex")
    List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);
    @Select("SELECT " + " e.happen_time as createAt, " + " e.event_des, " + " e.event_deal_status  " + "FROM "
@@ -272,6 +281,10 @@
        + " community_id = #{communityId} and label like concat('%',#{label},'%')")
    Integer getSpecialStatisticsByLabel(@Param("label") String label,@Param("communityId") Long communityId);
    @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
            + " community_id = #{communityId} ")
    Integer getSpecialStatistics(@Param("communityId") Long communityId);
    @Select("<script> " + "SELECT " + " count( egd.id ) AS gridTotal, "
        + " ( select count(egmr.id) from event_grid_member_relation as egmr"
        + " left join event_grid_data as egd1 on egd1.id = egmr.grid_id where egd1.grid_community_id = egd.grid_community_id ) AS gridMemberTotal, "
@@ -328,7 +341,7 @@
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
    @Select("<script> " + "SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng  "
    @Select("<script> " + "(SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng,e.create_at as createAt  "
        + "FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
        + " e.event_category = 1  " + " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " + " AND e.event_status = 2  "
        + " AND egd.grid_community_id = #{screenEventDTO.communityId}  "
@@ -340,14 +353,14 @@
        + " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " + " </if> "
        + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
        + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
        + " </if> " + "UNION ALL SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng  "
        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
        + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> "
        + "<if test='screenEventDTO.eventProcessStatus != null'>"
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> " + " </script>")
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> )" + "order by createAt desc </script>")
    List<EventGridIncidentStatisticsVO>
        getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
@@ -358,7 +371,7 @@
    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
        @Param("lastMonth") Date lastMonth);
    @Select("SELECT `NAME`, " + " user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
    @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
        + " com_mng_village AS cmv  " + "WHERE " + " community_id = #{communityId}")
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
@@ -418,7 +431,7 @@
    @Select("SELECT " + " id, " + " su.nick_name AS userName, " + " su.image_url, " + " caep.create_at, "
        + " caep.detail AS eventDes, " + " caep.happen_addr AS happenAddress, " + " caep.lng_lat AS happentLatLng, "
        + " caep.photo_path_list, " + " IFNULL( NULL, 7 ) AS eventType, " + " caep.handle_status AS eventDealStatus  "
        + " caep.photo_path_list, " + " IFNULL( NULL, 7 ) AS eventType, " + " caep.status AS eventDealStatus  "
        + "FROM " + " com_act_easy_photo AS caep " + " LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id  "
        + "WHERE " + " id = #{eventId}")
    EventNewStatisticsVO getEventScreenSSPDateil(@Param("eventId") Long eventId);
@@ -606,4 +619,57 @@
     * @param newUnitNo 新单元号
     */
    void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);
    /**
     * 根据villageId查询特殊人群数
     * @param villageId
     * @param label
     * @return
     */
    Integer selectCountByVillageId(@Param("villageId") Long villageId,@Param("label")String label);
    CivilPartyStatisticsVO getCivilParty(@Param("communityId") Long communityId);
    CivilGovernmentStatisticsVO getCivilGovernment(@Param("communityId") Long communityId);
    CivilGridStatisticsVO getCivilGrid(@Param("communityId") Long communityId);
    CivilConvenienceStatisticsVO getCivilConvenience(@Param("communityId") Long communityId);
    /**
     * 西区治理数据统计
     * @return
     */
    WestScreenStatics westScreenStatics();
    List<EventPopulationBasicsStatisticsVO> getBasicsList(@Param("streetId") Long streetId);
    EventPopulationSpecialStatisticsVO getPopulationSpecial(@Param("streetId") Long streetId);
    List<String> getPopulationListCardNo(@Param("streetId") Long streetId);
    Integer getPopulationAge(@Param("streetId") Long streetId, @Param("age") Integer age);
    List<EventPopulationStreetVO> getComprehensiveStreetList();
    /**
     * 基础数据统计
     * @param communityId
     * @return
     */
    BaseInfo baseInfo(Long communityId);
    /**
     * 业务数据统计
     * @param communityId
     * @return
     */
    IndexDynamic indexDynamic(Long communityId);
    /**
     * 大屏事件数据
     * @param communityId
     * @return
     */
    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -169,13 +169,13 @@
    List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,
        @Param("relation") Integer relation, @Param("relationId") Integer relationId);
    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} order by create_at asc")
    @Select("select id as houseId,floor from com_mng_population_house where village_id = #{villageId} and floor is not null group by floor order by create_at asc")
    List<ComMngSubordinateVO> getHouseLevelByFloors(@Param("villageId") Long villageId);
    @Select("select id as houseId,unit_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} order by create_at asc")
    @Select("select id as houseId,unit_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no is not null group by unit_no order by create_at asc")
    List<ComMngSubordinateVO> getHouseLevelByUnitNos(@Param("villageId") Long villageId, @Param("floor") String floor);
    @Select("select id as houseId,house_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no = #{unitNo} order by create_at asc")
    @Select("select id as houseId,house_no from com_mng_population_house where village_id = #{villageId} and floor = #{floor} and unit_no = #{unitNo} and house_no is not null group by house_no order by create_at asc")
    List<ComMngSubordinateVO> getHouseLevelByHouseNos(@Param("villageId") Long villageId, @Param("floor") String floor,
        @Param("unitNo") String unitNo);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
@@ -46,7 +46,7 @@
    @Select("update com_mng_population_house_user set relation_id = null where id = #{id}")
    Integer delBuildingHousePopulationRelationId(@Param("id") Long id);
    @Select("SELECT " + " cmv.`name` AS villageName, " + " cmph.id, " + " cmv.address, " + " cmph.floor, "
    @Select("SELECT " + " cmv.`name` AS villageName, " + " cmph.id, " + " cmv.address, " + " cmph.floor,cmphu.relation, "
        + " cmph.unit_no, " + " cmph.house_no  " + "FROM " + " com_mng_population_house_user AS cmphu "
        + " LEFT JOIN com_mng_population_house AS cmph ON cmph.id = cmphu.house_id "
        + " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmph.village_id  " + "WHERE "
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
@@ -3,6 +3,10 @@
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.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_community.model.dos.ComPbMemberDO;
import org.apache.ibatis.annotations.Mapper;
@@ -26,4 +30,33 @@
     * @return
     */
    ComPbMemberVO selectById(String idCard);
    /**
     *根据社区id日期查询活动数
     * @param communityId
     * @param date
     * @return
     */
    BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date);
    /**
     * 查询党员积分前3
     * @param communityId
     * @return
     */
    List<BigScreenActivityTop> selectActivityTop(@Param("communityId") Long communityId);
    /**
     * 服务数据查询
     * @param communityId
     * @return
     */
    BigScreenServiceData bigScreenServiceData(@Param("communityId")Long communityId);
    /**
     * 服务居民
     * @param communityId
     * @return
     */
    List<BigScreenServiceUser> bigScreenServiceUser(@Param("communityId")Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
@@ -6,9 +6,12 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * (ComProperty)表数据库访问层
@@ -25,4 +28,23 @@
     * @return
     */
    IPage<ComPropertyVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    /**
     * 居民自治大屏统计数据获取
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getRepairPolylineDate(@Param("communityId") Long communityId);
    /**
     * 报事报修date之前的累计数量
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO getRepairTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    List<StatisticsCommVO> getEventAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getEventTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyPublicityDAO.java
New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.dao;
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.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
import com.panzhihua.service_community.model.dos.ComPropertyPublicityDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @title: ComPropertyPublicityDAO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传mapper
 * @author: hans
 * @date: 2021/11/11 13:58
 */
@Mapper
public interface ComPropertyPublicityDAO extends BaseMapper<ComPropertyPublicityDO> {
    /**
     * 获取用户菜单权限
     * @param userId
     * @return
     */
    List<String> retrieveUserMenuList(@Param("userId") Long userId);
    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    IPage<ComPropertyPublicityVO> pageComPropertyPublicity(@Param("page") Page page, @Param("pageComPropertyPublicityDTO") PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 获取物业宣传详情
     * @param id
     * @return
     */
    ComPropertyPublicityVO selectDetail(@Param("id") Long id);
    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    IPage<ComPropertyPublicityVO> pageComPropertyPublicityApplet(@Param("page") Page page, @Param("pageComPropertyPublicityDTO") PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    int incrView(@Param("id") Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -21,17 +21,17 @@
    @Select("<script>"
        + "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`,"
        + "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" + " <where>"
        + "c.delete_status=1 and c.status = 1"
        + "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c " + " <where>"
        + "c.delete_status=1 and c.status = 1 "
        + "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>"
        + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" + " </if> "
        + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%')  " + " </if> "
        + "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != &quot;&quot;'>"
        + "and c.store_account = #{pageComShopStoreDTO.account} \n" + " </if> "
        + "and c.store_account = #{pageComShopStoreDTO.account}  " + " </if> "
        + "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != &quot;&quot;'>"
        + "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" + " </if> "
        + "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%')  " + " </if> "
        + "<if test='pageComShopStoreDTO.deliveryType != null'>"
        + "and c.delivery_type =#{pageComShopStoreDTO.deliveryType}\n" + " </if> "
        + "<if test='pageComShopStoreDTO.status != null'>" + "and c.status =#{pageComShopStoreDTO.status} \n"
        + "and c.delivery_type =#{pageComShopStoreDTO.deliveryType} " + " </if> "
        + "<if test='pageComShopStoreDTO.status != null'>" + "and c.status =#{pageComShopStoreDTO.status}  "
        + " </if> " + " </where>" + " order by c.create_at desc" + "</script>")
    IPage<PageShopStoreVO> pageShopStore(Page page,
        @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
@@ -2,10 +2,14 @@
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.convenient.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
import com.panzhihua.common.model.vos.community.convenient.ConvenientConsultationStatisticsVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
@@ -50,6 +54,8 @@
     * @return
     */
    ConvenientMerchantVO selectMerchantById(@Param("merchantId") Long merchantId);
    List<ConvenientMerchantVO> selectMerchantByName(@Param("communityId") Long communityId, @Param("currentMon") String currentMon);
    /**
     * 获取社区下热门商家
@@ -122,4 +128,29 @@
     * @return
     */
    int batchUpdateBusinessStatus(@Param("convenientMerchantDOList") List<ConvenientMerchantDO> convenientMerchantDOList, @Param("status") int status);
    /**
     * 社区商家
     * @param communityId
     * @return
     */
    List<ConvenientMerchantVO> selectMerchantListByCommunity(@Param("communityId") Long communityId);
    /**
     * 大屏分页获取热度排行商家
     * @param page
     * @param pagePopularMerchantDTO
     * @return
     */
    List<ConvenientMerchantVO> getScreenPopularMerchants(@Param("page") Page page, @Param("pagePopularMerchantDTO") PagePopularMerchantDTO pagePopularMerchantDTO);
    BigScreenMerchantStatisticsInfo getIndexMerchantBaseData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> selectServiceTypeCircleData(@Param("communityId") Long communityId);
    List<StatisticsCommVO> getServiceTimesAddPolylineData(@Param("communityId") Long communityId);
    StatisticsCommVO getServiceTimesTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
    IPage<ConvenientMerchantVO> indexMerchantList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseContractConfigDao.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.entity.RentingHourseContractConfig;
import org.apache.ibatis.annotations.Param;
/**
 * 房屋租赁-配置项表(RentingHourseContractConfig)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:46:19
 */
@Mapper
public interface RentingHourseContractConfigDao extends BaseMapper<RentingHourseContractConfig> {
    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    IPage<RentingHousesConfigVO> pageRentingHousesConfig(@Param("page") Page page,
                                                         @Param("pageRentingHousesConfigDTO") PageRentingHousesConfigDTO pageRentingHousesConfigDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseFileDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseFile;
/**
 * 房屋租赁-涉及的文件表(RentingHourseFile)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:46:19
 */
@Mapper
public interface RentingHourseFileDao extends BaseMapper<RentingHourseFile> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseLabelDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseLabel;
/**
 * 房屋租赁-房源标签(RentingHourseLabel)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:46:38
 */
@Mapper
public interface RentingHourseLabelDao extends BaseMapper<RentingHourseLabel> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseOrderDao.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.dao;
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.rentHouse.OrderStatics;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseOrder;
import org.apache.ibatis.annotations.Param;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:46:55
 */
@Mapper
public interface RentingHourseOrderDao extends BaseMapper<RentingHourseOrder> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<RentingHourseOrderVO> pageList(Page page,@Param("commonPage")CommonPage commonPage);
    /**
     * 订单统计
     * @param rentingHourseOrderVO
     * @return
     */
    OrderStatics orderStatics(RentingHourseOrderVO rentingHourseOrderVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePayingOrderDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHoursePayingOrder;
/**
 * 房屋租赁-支付流水记录表(RentingHoursePayingOrder)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:47:16
 */
@Mapper
public interface RentingHoursePayingOrderDao extends BaseMapper<RentingHoursePayingOrder> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePreOrderDao.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.dao;
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.rentHouse.PreOrderStatics;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import org.apache.ibatis.annotations.Param;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:47:53
 */
@Mapper
public interface RentingHoursePreOrderDao extends BaseMapper<RentingHoursePreOrder> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<RentingHoursePreOrderVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    /**
     * 定金统计
     * @param rentingHoursePreOrderVO
     * @return
     */
    PreOrderStatics statics(RentingHoursePreOrderVO rentingHoursePreOrderVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRefundOrderDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseRefundOrder;
/**
 * 房屋租赁-退款流水记录表(RentingHourseRefundOrder)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:48:14
 */
@Mapper
public interface RentingHourseRefundOrderDao extends BaseMapper<RentingHourseRefundOrder> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRegisterDao.java
New file
@@ -0,0 +1,51 @@
package com.panzhihua.service_community.dao;
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.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * 房屋租售-租赁房屋登记(RentingHourseRegister)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:49:08
 */
@Mapper
public interface RentingHourseRegisterDao extends BaseMapper<RentingHourseRegister> {
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    IPage<RentingHouseRegisterVO> pageRentingHouse(@Param("page") Page page,
                                                   @Param("pageRegisterDTO") PageRentingHouseRegisterDTO pageRegisterDTO);
    /**
     * 正方形查找附近的房屋
     * @param minX
     * @param maxX
     * @param minY
     * @param maxY
     * @param nearbyDTO
     * @return
     */
    List<RentingHouseRegisterVO> nearby(@Param("minX") Double minX, @Param("maxX") Double maxX, @Param("minY") Double minY,
                                        @Param("maxY") Double maxY, @Param("nearbyDTO") NearbyDTO nearbyDTO);
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    IPage<RentingHouseRegisterVO> pageRentingHouseApplet(@Param("page") Page page,
                                                   @Param("pageRegisterDTO") PageRentingHouseRegisterDTO pageRegisterDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseReturnOrderDao.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.RentingHourseReturnOrder;
/**
 * 房屋租赁-房屋退租申请表(RentingHourseReturnOrder)表数据库访问层
 *
 * @author makejava
 * @since 2021-11-23 10:49:37
 */
@Mapper
public interface RentingHourseReturnOrderDao extends BaseMapper<RentingHourseReturnOrder> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityCode.java
New file
@@ -0,0 +1,70 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 签到二维码表(ComActActivityCode)表实体类
 *
 * @author makejava
 * @since 2021-10-15 15:23:08
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("签到二维码表")
public class ComActActivityCode implements Serializable {
    private static final long serialVersionUID = 821676065778343316L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 活动id
     */
    @ApiModelProperty(value = "活动id")
    private Long activityId;
    /**
     * 二维码编号
     */
    @ApiModelProperty(value = "二维码编号")
    private String code;
    /**
     * 状态 1 有效 2过时
     */
    @ApiModelProperty(value = "状态 1 有效 2过时")
    private Integer status;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * 二维码类型 1居民志愿者 2党员
     */
    @ApiModelProperty("二维码类型 1居民志愿者 2党员")
    private Integer type;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java
New file
@@ -0,0 +1,66 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActAnnouncement)表实体类
 *
 * @author makejava
 * @since 2021-11-01 13:45:54
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComActAnnouncement implements Serializable {
    private static final long serialVersionUID = -26741210716448548L;
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * 发布人id
     */
    @ApiModelProperty(value = "发布人id")
    private Long userId;
    /**
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    private Long columnId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
@@ -19,7 +19,7 @@
 * 分类列表(ComActColumn)表实体类
 *
 * @author makejava
 * @since 2021-10-20 17:28:12
 * @since 2021-11-01 14:38:25
 */
@Data
@Builder
@@ -28,7 +28,7 @@
@ApiModel("分类列表")
public class ComActColumn implements Serializable {
    private static final long serialVersionUID = -41575392814328471L;
    private static final long serialVersionUID = 935049089365383863L;
    @TableId(type = IdType.AUTO)
    private Long id;
@@ -70,14 +70,18 @@
    private Integer status;
    /**
     * 分类类型 1服务类型分类 2技能分类
     * 分类类型 1服务类型分类 2技能分类3公告分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类")
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类3公告分类")
    private Integer type;
    /**
     * 描述
     */
    @ApiModelProperty(value = "描述")
    private String description;
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseContractConfig.java
New file
@@ -0,0 +1,90 @@
package com.panzhihua.service_community.entity;
import java.io.Serializable;
import java.util.Date;
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;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
 * 房屋租赁-配置项表(RentingHourseContractConfig)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:46:18
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-配置项表")
public class RentingHourseContractConfig implements Serializable {
    private static final long serialVersionUID = 744873176398268704L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 配置名称
     */
    @ApiModelProperty(value = "配置名称")
    @TableField("`name`")
    private String name;
    /**
     * 配置项目
     */
    @ApiModelProperty(value = "配置项目")
    @TableField("`key`")
    private String key;
    /**
     * 配置内容
     */
    @ApiModelProperty(value = "配置内容")
    @TableField("`value`")
    private String value;
    /**
     * 如果是合同项,填写合同内容模板
     */
    @ApiModelProperty(value = "如果是合同项,填写合同内容模板")
    private String textTemplate;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 修改者
     */
    @ApiModelProperty(value = "修改者")
    private Long modifyUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date modifyDate;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseFile.java
New file
@@ -0,0 +1,117 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-涉及的文件表(RentingHourseFile)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:46:18
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-涉及的文件表")
public class RentingHourseFile implements Serializable {
    private static final long serialVersionUID = -23971845137069675L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.INPUT)
    private Long id;
    /**
     * 分类(1、房源图片 2、产权证明图片 3、证件照片)
     */
    @ApiModelProperty(value = "分类(1、房源图片 2、产权证明图片 3、证件照片)")
    private Integer classification;
    /**
     * 租售登记表ID
     */
    @ApiModelProperty(value = "租售登记表ID")
    private Long refId;
    /**
     * 事件上传的资源类型(1是图片2是音频3是视频)
     */
    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是视频)")
    private Integer type;
    /**
     * 资源名称
     */
    @ApiModelProperty(value = "资源名称")
    private String resourceName;
    /**
     * 资源大小
     */
    @ApiModelProperty(value = "资源大小")
    private String resourceSize;
    /**
     * 视频或音频时长
     */
    @ApiModelProperty(value = "视频或音频时长")
    private Integer resourceTime;
    /**
     * 事件上传的资源URL地址
     */
    @ApiModelProperty(value = "事件上传的资源URL地址")
    private String url;
    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 上传标识
     */
    @ApiModelProperty(value = "上传标识")
    private Integer upload;
    /**
     * 分类(1、房源图片 2、产权证明图片 3、证件照片)
     */
    public interface Classification {
        int fytp = 1;
        int cqtp = 2;
        int zjzq = 3;
    }
    /**
     * 事件上传的资源类型(1是图片2是音频3是视频)
     */
    public interface Type {
        int picture = 1;
        int audio = 2;
        int video = 3;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseLabel.java
New file
@@ -0,0 +1,100 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-房源标签(RentingHourseLabel)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:46:37
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-房源标签")
public class RentingHourseLabel implements Serializable {
    private static final long serialVersionUID = -84202933369353026L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.INPUT)
    private Long id;
    /**
     * 标签名
     */
    @ApiModelProperty(value = "标签名")
    private String name;
    /**
     * 助记码
     */
    @ApiModelProperty(value = "助记码")
    private String mnemonicCode;
    /**
     * 启用状态(0:停用,1:启用)
     */
    @ApiModelProperty(value = "启用状态(0:停用,1:启用)")
    private Integer enabled;
    /**
     * 排序号
     */
    @ApiModelProperty(value = "排序号")
    private Integer sort;
    /**
     * 备注说明
     */
    @ApiModelProperty(value = "备注说明")
    private String remarks;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 修改者
     */
    @ApiModelProperty(value = "修改者")
    private Long modifyUser;
    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date modifyDate;
    /**
     * 删除标识(0:未删除,1:已删除)
     */
    @ApiModelProperty(value = "删除标识(0:未删除,1:已删除)")
    private Integer deleteFlag;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseOrder.java
New file
@@ -0,0 +1,287 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:46:55
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-房屋订单表")
public class RentingHourseOrder implements Serializable {
    private static final long serialVersionUID = -89476181595393122L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 街道ID
     */
    @ApiModelProperty(value = "街道ID")
    private Long streetId;
    /**
     * 小区id
     */
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 小区名称
     */
    @ApiModelProperty(value = "小区名称")
    private String villageName;
    /**
     * 订单类型(1、新订单2、续租订单)
     */
    @ApiModelProperty(value = "订单类型(1、新订单2、续租订单)")
    private Integer orderType;
    /**
     * 续租订单的原订单号
     */
    @ApiModelProperty(value = "续租订单的原订单号")
    private String originOrderSn;
    /**
     * 订单SN号
     */
    @ApiModelProperty(value = "订单SN号")
    private String orderSn;
    /**
     * 交易流水号
     */
    @ApiModelProperty(value = "交易流水号")
    private Long paySn;
    /**
     * 租赁月数(多少个月)
     */
    @ApiModelProperty(value = "租赁月数(多少个月)")
    private Integer rentingMonth;
    /**
     * 建筑面积
     */
    @ApiModelProperty(value = "建筑面积")
    private String constructArea;
    /**
     * 房型
     */
    @ApiModelProperty(value = "房型")
    private String roomType;
    /**
     * 月租金
     */
    @ApiModelProperty(value = "月租金")
    private BigDecimal monthlyRentMoney;
    /**
     * 保证金
     */
    @ApiModelProperty(value = "保证金")
    private BigDecimal depositAmount;
    /**
     * 服务费
     */
    @ApiModelProperty(value = "服务费")
    private BigDecimal serverCharge;
    /**
     * 定金
     */
    @ApiModelProperty(value = "定金")
    private BigDecimal dingAmount;
    /**
     * 支付定金的订单号
     */
    @ApiModelProperty(value = "支付定金的订单号")
    private String preOrderSn;
    /**
     * 支付的定金的订单备注
     */
    @ApiModelProperty(value = "支付的定金的订单备注")
    private String preOrderNote;
    /**
     * 订单是否已经平台结算
     */
    @ApiModelProperty(value = "订单是否已经平台结算")
    private String settingFlag;
    /**
     * 结算金额
     */
    @ApiModelProperty(value = "结算金额")
    private BigDecimal settingAmount;
    /**
     * 计算订单号
     */
    @ApiModelProperty(value = "计算订单号")
    private String settingSn;
    /**
     * 平台结算时间
     */
    @ApiModelProperty(value = "平台结算时间")
    private Date settingDate;
    /**
     * 总楼层
     */
    @ApiModelProperty(value = "总楼层")
    private String totalFloor;
    /**
     * 朝向
     */
    @ApiModelProperty(value = "朝向")
    private String orientation;
    /**
     * 装饰
     */
    @ApiModelProperty(value = "装饰")
    private String decoration;
    /**
     * 房内物品
     */
    @ApiModelProperty(value = "房内物品")
    private String hourseItem;
    /**
     * 房主姓名
     */
    @ApiModelProperty(value = "房主姓名")
    private String hourseOwnerName;
    /**
     * 房主身份证
     */
    @ApiModelProperty(value = "房主身份证")
    private String hourseIdCard;
    /**
     * 房主电话
     */
    @ApiModelProperty(value = "房主电话")
    private String hoursePhone;
    /**
     * 租客的用户ID,微信用户类型
     */
    @ApiModelProperty(value = "租客的用户ID,微信用户类型")
    private Long rentingUserId;
    /**
     * 租赁开始时间
     */
    @ApiModelProperty(value = "租赁开始时间")
    private Date startDate;
    /**
     * 租赁结束时间
     */
    @ApiModelProperty(value = "租赁结束时间")
    private Date endDate;
    /**
     * 合同内容
     */
    @ApiModelProperty(value = "合同内容")
    private String contractText;
    /**
     * 已支付定金金额(已经下定金的金额)
     */
    @ApiModelProperty(value = "已支付定金金额(已经下定金的金额)")
    private BigDecimal payedDingMoney;
    /**
     * 订单最终金额
     */
    @ApiModelProperty(value = "订单最终金额")
    private BigDecimal totalAccount;
    /**
     * 1、订单未支付2、订单已支付,待房东签约3、房东已签约,合同生效4、已退款
     */
    @ApiModelProperty(value = "1、订单未支付2、订单已支付,待房东签约3、房东已签约,合同生效4、已退款")
    private Integer status;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 房屋登记ID
     */
    @ApiModelProperty(value = "房屋登记ID")
    private Long registerId;
    /**
     * 订单类型 1普通新订单 2续租订单
     */
    public interface orderType{
        int pt=1;
        int xz=2;
    }
    /**
     * 1、订单未支付2、订单已支付,待房东签约3、房东已签约,合同生效4、已退款
     */
    public interface status{
        int wzf=1;
        int yzf=2;
        int ysx=3;
        int ytk=4;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePayingOrder.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-支付流水记录表(RentingHoursePayingOrder)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:47:15
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-支付流水记录表")
public class RentingHoursePayingOrder implements Serializable {
    private static final long serialVersionUID = 549655745079867000L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 支付类型
     */
    @ApiModelProperty(value = "支付类型")
    private String payType;
    /**
     * 支付时间
     */
    @ApiModelProperty(value = "支付时间")
    private Date payDate;
    /**
     * 支付金额
     */
    @ApiModelProperty(value = "支付金额")
    private BigDecimal payAmount;
    /**
     * 支付返回内容
     */
    @ApiModelProperty(value = "支付返回内容")
    private String payReturnText;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePreOrder.java
New file
@@ -0,0 +1,136 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:47:52
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-房屋定金订单表")
public class RentingHoursePreOrder implements Serializable {
    private static final long serialVersionUID = -60478773417437988L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 订单SN号
     */
    @ApiModelProperty(value = "订单SN号")
    private String orderSn;
    /**
     * 房屋登记ID
     */
    @ApiModelProperty(value = "房屋登记ID")
    private Long registerId;
    /**
     * 定金
     */
    @ApiModelProperty(value = "定金")
    private BigDecimal dingMoney;
    /**
     * 合同内容
     */
    @ApiModelProperty(value = "合同内容")
    private String contractText;
    /**
     * 0 待支付 1 已缴纳定金,待抵扣 2、合同已签订,定金已抵扣 3、房东未按时处理,定金已退款  4、已退还定金 5、未按时去和房东签约订单过期,定金不退,已失效
     */
    @ApiModelProperty(value = "0 待支付 1 已缴纳定金,待抵扣 2、合同已签订,定金已抵扣 3、房东未按时处理,定金已退款  4、已退还定金 5、未按时去和房东签约订单过期,定金不退,已失效")
    private Integer status;
    /**
     * 定金保留时间
     */
    @ApiModelProperty(value = "定金保留时间")
    private Date expireDate;
    /**
     * 房东扫描的时候绑定微信APPID
     */
    @ApiModelProperty(value = "房东扫描的时候绑定微信APPID")
    private String hourseOwnerWeixinAppid;
    /**
     * 房东的用户ID,用户表记录了房东的详细信息
     */
    @ApiModelProperty(value = "房东的用户ID,用户表记录了房东的详细信息")
    private Long hourseOwnerUserId;
    /**
     * 租客的微信APPID
     */
    @ApiModelProperty(value = "租客的微信APPID")
    private String tenantWeixinAppid;
    /**
     * 租客的用户ID,房东的用户ID,用户表记录了租客的详细信息
     */
    @ApiModelProperty(value = "租客的用户ID,房东的用户ID,用户表记录了租客的详细信息")
    private Long tenantUserId;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 流水号
     */
    @ApiModelProperty(value = "流水号")
    private Long paySn;
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    @ApiModelProperty(value = "房屋名称")
    private String villageName;
    /**
     * 0 待支付 1 已缴纳定金,待抵扣 2、合同已签订,定金已抵扣 3、房东未按时处理,定金已退款  4、已退还定金 5、未按时去和房东签约订单过期,定金不退,已失效
     */
    public interface status{
        int dzf=0;
        int yjl=1;
        int yqd=2;
        int ytk=3;
        int yth=4;
        int ysx=5;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRefundOrder.java
New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-退款流水记录表(RentingHourseRefundOrder)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:48:14
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-退款流水记录表")
public class RentingHourseRefundOrder implements Serializable {
    private static final long serialVersionUID = -59941753700164541L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 支付类型
     */
    @ApiModelProperty(value = "支付类型")
    private String refundPayType;
    /**
     * 支付时间
     */
    @ApiModelProperty(value = "支付时间")
    private Date refundPayDate;
    /**
     * 支付金额
     */
    @ApiModelProperty(value = "支付金额")
    private BigDecimal refundAmount;
    /**
     * 支付返回内容
     */
    @ApiModelProperty(value = "支付返回内容")
    private String returnText;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRegister.java
New file
@@ -0,0 +1,355 @@
package com.panzhihua.service_community.entity;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租售-租赁房屋登记(RentingHourseRegister)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:49:07
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租售-租赁房屋登记")
public class RentingHourseRegister implements Serializable {
    private static final long serialVersionUID = 687172975256702649L;
    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    @TableId(type = IdType.INPUT)
    private Long id;
    /**
     * 街道ID
     */
    @ApiModelProperty(value = "街道ID")
    private Long streetId;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 小区id
     */
    @ApiModelProperty(value = "小区id")
    private Long villageId;
    /**
     * 小区名称
     */
    @ApiModelProperty(value = "小区名称")
    private String villageName;
    /**
     * 街路巷
     */
    @ApiModelProperty(value = "街路巷")
    private String alley;
    /**
     * 门牌号
     */
    @ApiModelProperty(value = "门牌号")
    private String houseNum;
    /**
     * 楼栋号
     */
    @ApiModelProperty(value = "楼栋号")
    private String buildingNo;
    /**
     * 单元号
     */
    @ApiModelProperty(value = "单元号")
    private String unitNo;
    /**
     * 楼排号
     */
    @ApiModelProperty(value = "楼排号")
    private String floor;
    /**
     * 户室(房间号)
     */
    @ApiModelProperty(value = "户室(房间号)")
    private String houseNo;
    /**
     * 房屋编号
     */
    @ApiModelProperty(value = "房屋编号")
    private String code;
    /**
     * 房屋地址
     */
    @ApiModelProperty(value = "房屋地址")
    private String address;
    /**
     * 认证码
     */
    @ApiModelProperty(value = "认证码")
    private String authCode;
    /**
     * 认证状态(1、未认证2、已认证)
     */
    @ApiModelProperty(value = "认证状态(1、未认证2、已认证)")
    private Integer authStatus;
    /**
     * 房屋状态(1、待发布 2、已发布,待出租2、出租中3、已退租
     */
    @ApiModelProperty(value = "房屋状态(1、待发布 2、已发布,待出租2、出租中3、已退租")
    private Integer status;
    /**
     * 1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期)
     */
    @ApiModelProperty(value = "1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期)")
    private Integer detailStatus;
    @ApiModelProperty(value = "房屋的经度")
    private String longitude;
    @ApiModelProperty(value = "房屋的纬度")
    private String latitude;
    /**
     * 建筑面积
     */
    @ApiModelProperty(value = "建筑面积")
    private BigDecimal constructArea;
    /**
     * 层次递归字段(省>市>区县>街道>社区>小区>详细地址)
     */
    @ApiModelProperty(value = "层次递归字段(省>市>区县>街道>社区>小区>详细地址)")
    private String path;
    /**
     * 看房电话
     */
    @ApiModelProperty(value = "看房电话")
    private String seeHourseTelephone;
    /**
     * 租房标题
     */
    @ApiModelProperty(value = "租房标题")
    private String title;
    /**
     * 室数量
     */
    @ApiModelProperty(value = "室数量")
    private Integer brn;
    /**
     * 厅数量
     */
    @ApiModelProperty(value = "厅数量")
    private Integer lrn;
    /**
     * 卫数量
     */
    @ApiModelProperty(value = "卫数量")
    private Integer wcn;
    /**
     * 房型
     */
    @ApiModelProperty(value = "房型")
    private String roomType;
    /**
     * 月租金
     */
    @ApiModelProperty(value = "月租金")
    private BigDecimal monthlyRentMoney;
    /**
     * 保证金
     */
    @ApiModelProperty(value = "保证金")
    private BigDecimal depositMoney;
    /**
     * 服务费
     */
    @ApiModelProperty(value = "服务费")
    private BigDecimal serverCharge;
    /**
     * 定金
     */
    @ApiModelProperty(value = "定金")
    private BigDecimal dingMoney;
    /**
     * 总楼层
     */
    @ApiModelProperty(value = "总楼层")
    private String totalFloor;
    /**
     * 朝向(1东2南3西4北5东南6东北7西南8西北9南北10东西)
     */
    @ApiModelProperty(value = "朝向(1东2南3西4北5东南6东北7西南8西北9南北10东西)")
    private Integer orientation;
    /**
     * 装修情况(1.毛坯房 2.简装 3.精装修)
     */
    @ApiModelProperty(value = "装修情况(1.毛坯房 2.简装 3.精装修)")
    private Integer decoration;
    /**
     * 看房时间(1.随时看房 2.提前预约)
     */
    @ApiModelProperty(value = "看房时间(1.随时看房 2.提前预约)")
    private Integer seeHourseDate;
    /**
     * 房屋介绍
     */
    @ApiModelProperty(value = "房屋介绍")
    private String hourseDescription;
    /**
     * 入住要求
     */
    @ApiModelProperty(value = "入住要求")
    private String checkInRequirement;
    /**
     * 房内物品
     */
    @ApiModelProperty(value = "房内物品")
    private String hourseItem;
    /**
     * 房屋标签
     */
    @ApiModelProperty(value = "房屋标签")
    private String label;
    /**
     * 房主姓名
     */
    @ApiModelProperty(value = "房主姓名")
    private String hourseOwnerName;
    /**
     * 房主身份证
     */
    @ApiModelProperty(value = "房主身份证")
    private String hourseIdCard;
    /**
     * 房主电话
     */
    @ApiModelProperty(value = "房主电话")
    private String hoursePhone;
    /**
     * 登记状态(1、保存草稿2、完成登记)
     */
    @ApiModelProperty(value = "登记状态(1、保存草稿2、完成登记)")
    private Integer infoStatus;
    /**
     * 房东扫描的时候绑定微信APPID
     */
    @ApiModelProperty(value = "房东扫描的时候绑定微信APPID")
    private String hourseOwnerWeixinAppid;
    /**
     * 房东的用户ID,用户表记录了房东的详细信息
     */
    @ApiModelProperty(value = "房东的用户ID,用户表记录了房东的详细信息")
    private Long hourseOwnerUserId;
    /**
     * 租客的微信APPID
     */
    @ApiModelProperty(value = "租客的微信APPID")
    private String tenantWeixinAppid;
    /**
     * 租客的用户ID,房东的用户ID,用户表记录了租客的详细信息
     */
    @ApiModelProperty(value = "租客的用户ID,房东的用户ID,用户表记录了租客的详细信息")
    private Long tenantUserId;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 认证状态(1、未认证2、已认证)
     */
    public interface AuthStatus{
        int wrz = 1;
        int yrz = 2;
    }
    /**
     * 房屋状态(1、待发布 2、已发布,待出租 3、出租中 4、已退租
     */
    public interface Status{
        int dfb = 1;
        int dcz = 2;
        int czz = 3;
        int ytz = 4;
    }
    /**
     * 1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期)
     */
    public interface DetailStatus{
        int drz = 1;
        int dfb = 2;
        int dcz = 3;
        int blz = 4;
        int czz = 5;
        int ycs = 6;
        int ydq = 7;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseReturnOrder.java
New file
@@ -0,0 +1,173 @@
package com.panzhihua.service_community.entity;
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;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 房屋租赁-房屋退租申请表(RentingHourseReturnOrder)表实体类
 *
 * @author makejava
 * @since 2021-11-23 10:49:36
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("房屋租赁-房屋退租申请表")
public class RentingHourseReturnOrder implements Serializable {
    private static final long serialVersionUID = -79596119735529836L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 退租订单号(直接使用原订单SN作为退租订单号)
     */
    @ApiModelProperty(value = "退租订单号(直接使用原订单SN作为退租订单号)")
    private String orderSn;
    /**
     * 退租时间
     */
    @ApiModelProperty(value = "退租时间")
    private Date endDate;
    /**
     * 水电气扣费
     */
    @ApiModelProperty(value = "水电气扣费")
    private String waterAndElectricityDeductionFee;
    /**
     * 水电气扣费说明
     */
    @ApiModelProperty(value = "水电气扣费说明")
    private String waterAndElectricityDetail;
    /**
     * 水电气扣费图片
     */
    @ApiModelProperty(value = "水电气扣费图片")
    private String waterAndElectricityDetailImages;
    /**
     * 物品损坏费
     */
    @ApiModelProperty(value = "物品损坏费")
    private String itemDeductionFee;
    /**
     * 物品损坏图片
     */
    @ApiModelProperty(value = "物品损坏图片")
    private String itemDeductionDetailImages;
    /**
     * 物品损坏费详情说明
     */
    @ApiModelProperty(value = "物品损坏费详情说明")
    private String itemDeductionDetail;
    /**
     * 违约金
     */
    @ApiModelProperty(value = "违约金")
    private String penaltyDeductionFee;
    /**
     * 违约金详情说明
     */
    @ApiModelProperty(value = "违约金详情说明")
    private String penaltyDeductionFeeDetail;
    /**
     * 违约金图片
     */
    @ApiModelProperty(value = "违约金图片")
    private String penaltyDeductionDetailImages;
    /**
     * 结算金额
     */
    @ApiModelProperty(value = "结算金额")
    private BigDecimal settlementAmount;
    /**
     * 退租状态(1、提交成功2、房东核算结算3、租客核算结算4、房东完成结算,退租成功)
     */
    @ApiModelProperty(value = "退租状态(1、提交成功2、房东核算结算3、租客核算结算4、房东完成结算,退租成功)")
    private Integer status;
    /**
     * 支付对象(1、房东退费2、租客补交)
     */
    @ApiModelProperty(value = "支付对象(1、房东退费2、租客补交)")
    private BigDecimal payObject;
    /**
     * 支付订单号
     */
    @ApiModelProperty(value = "支付订单号")
    private String payOrderSn;
    /**
     * 支付金额
     */
    @ApiModelProperty(value = "支付金额")
    private BigDecimal payOrderAmount;
    /**
     * 支付时间
     */
    @ApiModelProperty(value = "支付时间")
    private Date payOrderDate;
    /**
     * 备注说明
     */
    @ApiModelProperty(value = "备注说明")
    private String remarks;
    /**
     * 创建者
     */
    @ApiModelProperty(value = "创建者")
    private Long createUser;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createDate;
    /**
     * 修改者
     */
    @ApiModelProperty(value = "修改者")
    private Long modifyUser;
    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date modifyDate;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java
New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_community.message;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.service_community.dao.RentingHourseOrderDao;
import com.panzhihua.service_community.dao.RentingHoursePreOrderDao;
import com.panzhihua.service_community.dao.RentingHourseRegisterDao;
import com.panzhihua.service_community.entity.RentingHourseOrder;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
 * @author zzj
 */
@Component
public class OrderMessage {
    public static final String DELAYED_QUEUE="order.queue";
    @Resource
    private RentingHourseOrderDao rentingHourseOrderDao;
    @Resource
    private RentingHourseRegisterDao rentingHourseRegisterDao;
    @RabbitListener(queues=DELAYED_QUEUE)
    public void cancelProOrder(RentingHourseOrder rentingHourseOrderVO){
        RentingHourseOrder rentingHourseOrder=rentingHourseOrderDao.selectById(rentingHourseOrderVO.getId());
        if(rentingHourseOrder!=null){
            if(rentingHourseOrder.getStatus().equals(rentingHourseOrderVO.getStatus())){
                rentingHourseOrder.setStatus(RentingHourseOrder.status.ytk);
                rentingHourseOrderDao.updateById(rentingHourseOrder);
                //超时修改房屋状态
                RentingHourseRegister rentingHourseRegister=new RentingHourseRegister();
                rentingHourseRegister.setId(rentingHourseOrder.getRegisterId());
                rentingHourseRegister.setDetailStatus(3);
                rentingHourseRegisterDao.updateById(rentingHourseRegister);
                //退款逻辑待开发
            }
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_community.message;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.service_community.dao.RentingHoursePreOrderDao;
import com.panzhihua.service_community.dao.RentingHourseRegisterDao;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
 * @author zzj
 */
@Component
public class PreOrderMessage {
    public static final String DELAYED_QUEUE="preOrder.queue";
    @Resource
    private RentingHoursePreOrderDao rentingHoursePreOrderDao;
    @Resource
    private RentingHourseRegisterDao rentingHourseRegisterDao;
    @RabbitListener(queues=DELAYED_QUEUE)
    public void cancelProOrder(RentingHoursePreOrder rentingHoursePreOrderVO){
        if(rentingHoursePreOrderVO!=null){
            RentingHoursePreOrder rentingHoursePreOrder=rentingHoursePreOrderDao.selectById(rentingHoursePreOrderVO.getId());
            if(rentingHoursePreOrder.getStatus().equals(rentingHoursePreOrderVO.getStatus())){
                rentingHoursePreOrder.setStatus(RentingHoursePreOrder.status.ysx);
                rentingHoursePreOrderDao.updateById(rentingHoursePreOrder);
                //超时修改房屋状态
                RentingHourseRegister rentingHourseRegister=new RentingHourseRegister();
                rentingHourseRegister.setId(rentingHoursePreOrderVO.getRegisterId());
                rentingHourseRegister.setDetailStatus(3);
                rentingHourseRegisterDao.updateById(rentingHourseRegister);
            }
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java
@@ -44,6 +44,41 @@
    private Date createAt;
    /**
     * 开始时间
     */
    private Date startTime;
    /**
     * 结束时间
     */
    private Date endTime;
    /**
     * 奖励积分
     */
    private Integer award;
    /**
     * 签到位置
     */
    private String position;
    /**
     * 签到次数
     */
    private Integer times;
    /**
     * 二维码id
     */
    private Integer codeId;
    /**
     * 活动类型 1居民,志愿者 2党员
     */
    private Integer type;
    /**
    * 是否是志愿者 0 否 1 是
    */
    private Integer isVolunteer;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java
@@ -3,7 +3,12 @@
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
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 com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -42,4 +47,15 @@
     * 是否是志愿者 0 不是 1 是
     */
    private Integer isVolunteer;
    /**
     * 报名状态 0 已取消 1已报名
     */
    private Integer status;
    /**
     * 取消原因
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String reason;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -4,6 +4,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -173,4 +174,39 @@
     * 活动是否已默认好评
     */
    private Integer isDefaultPraise;
    /**
     * 签到范围,默认0无限制
     */
    @TableField("`range`")
    private Integer range;
    /**
     * 是否有积分奖励(1.是 2.否)
     */
    private Integer haveIntegralReward;
    /**
     * 积分奖励方式(1.按次奖励 2.记时奖励)
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Integer rewardWay;
    /**
     * 奖励积分
     */
    private Integer rewardIntegral;
    /**
     * 参与次数上限
     */
    @TableField("`limit`")
    private Integer limit;
    /**
     * 是否允许取消(1.允许 2.不允许)
     */
    private Integer canCancel;
    /**
     * 取消扣除积分
     */
    private Integer cancelDeduct;
    /**
     * 活动类型
     */
    private String activityType;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
@@ -110,4 +110,9 @@
     */
    private Long streetId;
    /**
     * 明文密码
     */
    private String plaintextPassword;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java
@@ -77,4 +77,14 @@
     * 封面模式:1-小图展示 2-大图展示
     */
    private Integer coverMode;
    /**
     * 跳转链接
     */
    private String jumpUrl;
    /**
     * 跳转状态
     */
    private Integer jumpType;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java
New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 17:54
 **/
@Data
@TableName(value = "com_pb_activity")
public class ComPbActivityDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 活动名称
     */
    private String name;
    /**
     * 活动地点
     */
    private String address;
    /**
     * 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
     */
    private Integer status;
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 活动开始时间
     */
    private Date activityTimeBegin;
    /**
     * 活动结束时间
     */
    private Date activityTimeEnd;
    /**
     * 报名开始时间
     */
    private Date enrollTimeBegin;
    /**
     * 报名结束时间
     */
    private Date enrollTimeEnd;
    /**
     * 活动参入人数
     */
    private Integer participationNum;
    /**
     * 活动封面
     */
    private String cover;
    /**
     * 活动内容-富文本
     */
    private String richText;
    /**
     * 活动最低参入人数-未达到到时间自动取消
     */
    private Integer participationLowestNum;
    /**
     * 取消原因
     */
    private String cancelReason;
    /**
     * 发布人
     */
    private Long createBy;
    /**
     * 发布时间
     */
    private Date releaseTime;
    /**
     * 社区id
     */
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java
New file
@@ -0,0 +1,90 @@
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;
/**
 * @title: ComPropertyPublicityDO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传实体类
 * @author: hans
 * @date: 2021/11/11 13:55
 */
@Data
@TableName(value = "com_property_publicity")
public class ComPropertyPublicityDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 宣传标题
     */
    private String title;
    /**
     * 宣传类型(0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主
     */
    private Integer publicityType;
    /**
     * 其他类型自定义名称
     */
    private String other;
    /**
     * 封面
     */
    private String cover;
    /**
     * 内容形式(1.文章链接 2.自定义内容)
     */
    private Integer contentType;
    /**
     * 文章链接
     */
    private String articleUrl;
    /**
     * 自定义内容
     */
    private String diyContent;
    /**
     * 物业公司id
     */
    private Long propertyId;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 浏览量
     */
    private Integer viewNum;
    /**
     * 发布时间
     */
    private Date createdAt;
    /**
     * 更新时间
     */
    private Date updatedAt;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java
@@ -10,6 +10,7 @@
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 org.springframework.web.bind.annotation.RequestParam;
/**
 * @ClasssName BigScreenService
@@ -56,4 +57,32 @@
     */
    R<List<BigScreenStatisticPartyActivity>>
        bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    R partyActivityLine(Long communityId);
    /**
     *查询党员积分前3
     * @param communityId
     * @return
     */
    R partyActivityTop(Long communityId);
    /**
     * 服务数据
     * @param communityId
     * @return
     */
    R serviceData(Long communityId);
    /**
     * 服务用户
     * @param communityId
     * @return
     */
    R serviceUser(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
New file
@@ -0,0 +1,126 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.vos.R;
/**
 * @title: BigScreenStatisticsService
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏统计服务类
 * @author: hans
 * @date: 2021/12/06 9:56
 */
public interface BigScreenStatisticsService {
    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    R getResidentAutonomy(Long communityId);
    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    R getGridsGovernance(Long communityId);
    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    R getCommunityServiceStatistics(Long communityId);
    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    R getScreenPopularMerchants(PagePopularMerchantDTO pagePopularMerchantDTO);
    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    R indexMicroWish(Long communityId);
    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    R indexEasyPhoto(Long communityId);
    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    R indexEasyPhotoList(PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    R indexQuestionnaire(Long communityId);
    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    R indexDyn(Long communityId);
    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexDynList(PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    R indexNeighbor(Long communityId);
    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexNeighborList(PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    R indexMerchant(Long communityId);
    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexMerchantList(PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexMicroWishList(PageBaseDTO pageBaseDTO);
    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexQuestionnaireList(PageBaseDTO pageBaseDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActEvaluateService.java
@@ -35,4 +35,12 @@
     * @return 当前用户对所有活动的评价列表
     */
    R listEvaluate(Long userId);
    /**
     * 我的评价
     * @param userId
     * @param activityId
     * @return
     */
    R listMyActivityEvaluate(Long userId, Long activityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityCodeService.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.service;
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.service_community.entity.ComActActivityCode;
/**
 * 签到二维码表(ComActActivityCode)表服务接口
 *
 * @author makejava
 * @since 2021-10-15 15:23:09
 */
public interface ComActActivityCodeService extends IService<ComActActivityCode> {
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -8,10 +8,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
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;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -197,9 +193,10 @@
     * 
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    R listActivity(Long userId);
    R listActivity(Long userId, Integer status);
    /**
     * 查询志愿者参与的所有已经完成的活动
@@ -266,4 +263,34 @@
     * @return 用户签到列表
     */
    R listSignInActivity(Long userId);
    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    R listSignInRecord(Long id);
    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    R listRegistRecord(Long id, Long userId);
    /**
     * 获取活动类型(目前只有志愿者活动需要获取)
     * @param communityId
     * @param type
     * @return
     */
    R listActivityType(Long communityId, Integer type);
    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    R addActivityType(ComActActivityTypeVO comActActivityTypeVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAnnouncementService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.ComActAnnouncement;
/**
 * (ComActAnnouncement)表服务接口
 *
 * @author makejava
 * @since 2021-11-01 13:45:55
 */
public interface ComActAnnouncementService extends IService<ComActAnnouncement> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
@@ -9,13 +9,21 @@
 * 分类列表(ComActColumn)表服务接口
 *
 * @author makejava
 * @since 2021-10-20 17:28:13
 * @since 2021-11-01 14:38:25
 */
public interface ComActColumnService extends IService<ComActColumn> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserService.java
@@ -49,11 +49,11 @@
    R getIntegralCommunityRankApplets(ComActIntegralCommunityRankDTO communityRankDTO);
    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    R getTaskActivityPeopleList(Long activityId);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActPictureLibraryService.java
New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.vos.R;
/**
 * @title: ComActPictureLibraryService
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 公共预设图库服务类
 * @author: hans
 * @date: 2021/11/23 17:01
 */
public interface ComActPictureLibraryService {
    /**
     * 获取预设图库
     * @param type
     * @param subtype
     * @return
     */
    R getPresetPictureLibrary(Integer type, Integer subtype);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java
@@ -14,10 +14,10 @@
    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @param pageReserveRegisterDetailedAdminDTO 登记id
     * @return  登记明细数据
     */
    R exportRegisterAdmin(Long reserveId);
    R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
    /**
     * 分页查询登记明细列表
@@ -26,4 +26,24 @@
     */
    R registerDetailedListAdmin(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 居家隔离导出
     * @param detailedAdminDTO
     * @return
     */
    R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    R bigScreenStaticsReserve(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.service_community.model.dos.ComActReserveDO;
/**
@@ -20,6 +21,13 @@
     * @return 预约登记结果
     */
    R commit(ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 外部提交预约登记
     * @param comActReserveCommitVO
     * @return 预约登记结果
     */
    R commitNoToken(ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 小程序我的预约登记
@@ -112,4 +120,11 @@
     */
    R reserveListApplets(Long communityId);
    /**
     * 返攀登记居家隔离大屏数据
     * @param communityId
     * @return
     */
    IndexReserve indexReserve(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -81,6 +81,13 @@
    R getCommunityLists();
    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    R getWestCommunityLists();
    /**
     * 查询社区所有列表
     * 
     * @return 社区列表
@@ -104,4 +111,6 @@
     * @return 社区列表
     */
    R communitySwitchSearchDistanceList(SearchCommunityDTO communityDTO);
    R getCommunityPassword(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java
@@ -34,6 +34,15 @@
    R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    /**
     * 导出  pageElderAuthRecords  导出
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    R export(PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
    /**
     * 根据高龄认证记录id查询详情 detailElderAuthRecords  根据高龄认证记录id查询详情
     * @param    authRecordId   高龄认证记录id
     * @return    R  查询结果
@@ -114,4 +123,11 @@
     * @return 认证记录详情
     */
    R retrieveElderAuthDetail(Long identityAuthId);
    /**
     * 高龄认证添加
     * @param comElderAuthRecordVO
     * @return
     */
    R add(ComElderAuthRecordVO comElderAuthRecordVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -514,4 +514,28 @@
    R relationVillage(String name);
    R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);
    /**
     * 导出特殊人群
     * @param PageInputUserDTO
     * @return
     */
    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);
    /**
     * 西区大屏治理数据
     * @return
     */
    R westScreenStatics();
    R getComprehensivePopulationStatics(Long streetId);
    R getComprehensiveStreetList();
    /**
     * 新版大屏首页
     * @param communityId
     * @return
     */
    R indexInfo(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -105,6 +105,9 @@
     */
    R getGridVillageList(ComMngVillageListAppDTO villageListAppDTO);
    R getGridVillageListApp(ComMngVillageListAppDTO villageListAppDTO);
    /**
     * 小区下楼栋列表
     * 
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthRecordService.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO;
@@ -130,4 +131,11 @@
     * @return 认证记录详情
     */
    R retrievePensionAuthDetail(Long identityAuthId);
    /**
     * 新增认证
     * @param comElderAuthRecordVO
     * @return
     */
    R add(ComElderAuthRecordVO comElderAuthRecordVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyPublicityService.java
New file
@@ -0,0 +1,75 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComPropertyPublicityDO;
/**
 * @title: ComPropertyPublicityService
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传服务类
 * @author: hans
 * @date: 2021/11/11 13:56
 */
public interface ComPropertyPublicityService extends IService<ComPropertyPublicityDO> {
    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    R pageComPropertyPublicity(PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    R addComPropertyPublicity(ComPropertyPublicityDTO comPropertyPublicityDTO);
    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    R updateComPropertyPublicity(ComPropertyPublicityDTO comPropertyPublicityDTO);
    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    R getComPropertyPublicity(Long id);
    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    R deleteComPropertyPublicity(Long id);
    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    R listProperty(Long villageId, Long communityId);
    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    R pageComPropertyPublicityApplet(PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    R incrView(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java
@@ -57,14 +57,14 @@
     * 
     * @return 查询结果
     */
    R getRotaPersonByDate(String rotaDate);
    R getRotaPersonByDate(String rotaDate,Long communityId);
    /**
     * 查询当天值班领导
     * 
     * @return 查询结果
     */
    R getRotaLeaderByDate(String rotaDate);
    R getRotaLeaderByDate(String rotaDate,Long communityId);
    /**
     * 选择人员
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseContractConfigService.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.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHourseContractConfig;
/**
 * 房屋租赁-配置项表(RentingHourseContractConfig)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:46:19
 */
public interface RentingHourseContractConfigService extends IService<RentingHourseContractConfig> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    R pageRentingHousesConfig(PageRentingHousesConfigDTO pageRentingHousesConfigDTO);
    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    R updateRentingHousesConfig(RentingHousesConfigDTO rentingHousesConfigDTO);
    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    R getRentingHouseConfig(Integer type);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseFileService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.RentingHourseFile;
/**
 * 房屋租赁-涉及的文件表(RentingHourseFile)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:46:19
 */
public interface RentingHourseFileService extends IService<RentingHourseFile> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseLabelService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.RentingHourseLabel;
/**
 * 房屋租赁-房源标签(RentingHourseLabel)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:46:38
 */
public interface RentingHourseLabelService extends IService<RentingHourseLabel> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseOrderService.java
New file
@@ -0,0 +1,53 @@
package com.panzhihua.service_community.service;
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.service_community.entity.RentingHourseOrder;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:46:56
 */
public interface RentingHourseOrderService extends IService<RentingHourseOrder> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 创建普通订单
     * @param rentingHourseOrderVO
     * @return
     */
    R createOrder(RentingHourseOrderVO rentingHourseOrderVO);
    /**
     * 微信成功支付回调
     * @param wxPayNotifyOrderVO
     * @return
     */
    R wxPayNotify(WxPayNotifyOrderVO wxPayNotifyOrderVO);
    /**
     * 微信支付
     * @param wxPayOrderVO
     * @return
     */
    R wxPay(WxPayOrderVO wxPayOrderVO);
    /**
     * 订单统计
     * @param rentingHourseOrderVO
     * @return
     */
    R statics(RentingHourseOrderVO rentingHourseOrderVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePayingOrderService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.RentingHoursePayingOrder;
/**
 * 房屋租赁-支付流水记录表(RentingHoursePayingOrder)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:47:16
 */
public interface RentingHoursePayingOrderService extends IService<RentingHoursePayingOrder> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePreOrderService.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_community.service;
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.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:47:53
 */
public interface RentingHoursePreOrderService extends IService<RentingHoursePreOrder> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 创建定金订单
     * @param rentingHoursePreOrderVO
     * @return
     */
    R createOrder(RentingHoursePreOrderVO rentingHoursePreOrderVO);
    /**
     * 定金订单统计
     * @param rentingHoursePreOrderVO
     * @return
     */
    R statics(RentingHoursePreOrderVO rentingHoursePreOrderVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRefundOrderService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.RentingHourseRefundOrder;
/**
 * 房屋租赁-退款流水记录表(RentingHourseRefundOrder)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:48:14
 */
public interface RentingHourseRefundOrderService extends IService<RentingHourseRefundOrder> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java
New file
@@ -0,0 +1,78 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHourseRegister;
/**
 * 房屋租售-租赁房屋登记(RentingHourseRegister)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:49:08
 */
public interface RentingHourseRegisterService extends IService<RentingHourseRegister> {
    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    R registerRentingHouse(RentingHouseRegisterDTO registerDTO);
    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    R updateRentingHouse(RentingHouseRegisterDTO registerDTO);
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    R pageRentingHouse(PageRentingHouseRegisterDTO pageRegisterDTO);
    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    R releaseOrCancelHouse(ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);
    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    R deleteRentingHouse(Long registerId);
    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    R getRentingHouse(Long registerId);
    /**
     * 附近的房屋
     * @param nearbyDTO
     * @return
     */
    R nearby(NearbyDTO nearbyDTO);
    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    R pageRentingHouseApplet(PageRentingHouseRegisterDTO pageRegisterDTO);
    /**
     * 方便手动调用批量更新
     */
    void updateAllHouseUnionAppCode();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseReturnOrderService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;
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.service_community.entity.RentingHourseReturnOrder;
/**
 * 房屋租赁-房屋退租申请表(RentingHourseReturnOrder)表服务接口
 *
 * @author makejava
 * @since 2021-11-23 10:49:37
 */
public interface RentingHourseReturnOrderService extends IService<RentingHourseReturnOrder> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -32,6 +35,8 @@
public class BigScreenServiceImpl implements BigScreenService {
    @Resource
    private BigScreenDAO bigScreenDAO;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    @Override
    public R partyOrgMembers(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
@@ -86,6 +91,11 @@
                listRt = listRt.subList(0, 3);
            }
        }
        listRt.forEach(partyBuildingMemberVO -> {
            if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
                partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
            }
        });
        return R.ok(listRt);
    }
@@ -101,4 +111,47 @@
        return R.ok(listR);
    }
    @Override
    public R partyActivityLine(Long communityId) {
        List<BigScreenActivityLine> bigScreenActivityLines=this.getPoints();
        bigScreenActivityLines.forEach(bigScreenActivityLine -> {
           BigScreenActivityLine bigScreenActivityLine1=comPbMemberDAO.selectActivityCountMonth(communityId,bigScreenActivityLine.getX());
           bigScreenActivityLine.setY(bigScreenActivityLine1.getY());
           bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY());
        });
        return R.ok(bigScreenActivityLines);
    }
    @Override
    public R partyActivityTop(Long communityId) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
    }
    @Override
    public R serviceData(Long communityId) {
        return R.ok(this.comPbMemberDAO.bigScreenServiceData(communityId));
    }
    @Override
    public R serviceUser(Long communityId) {
        return R.ok(this.comPbMemberDAO.bigScreenServiceUser(communityId));
    }
    public List<BigScreenActivityLine> getPoints(){
        List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
        for(int i=1;i<=12;i++){
            String aDate="";
            if(i<10){
                aDate = "0"+i;
            }
            else {
                aDate=i+"";
            }
            BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
            bigScreenActivityLine.setX(aDate);
            bigScreenActivityLines.add(bigScreenActivityLine);
        }
        return bigScreenActivityLines;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
New file
@@ -0,0 +1,665 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
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.BigScreenMerchantStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
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.convenient.ConvenientMerchantVO;
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.service_community.dao.ComActDiscussDAO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
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.ComActWarehouseDonatesDao;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: BigScreenStatisticsServiceImpl
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏统计服务实现类
 * @author: hans
 * @date: 2021/12/06 9:56
 */
@Service
@Slf4j
public class BigScreenStatisticsServiceImpl implements BigScreenStatisticsService {
    private static final Integer pageSize = 100;
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    @Resource
    private ComActMicroWishDAO comActMicroWishDAO;
    @Resource
    private ComActDiscussDAO comActDiscussDAO;
    @Resource
    private ComActNeighborCircleDAO comActNeighborCircleDAO;
    @Resource
    private ComPropertyDao comPropertyDao;
    @Resource
    private ComActWarehouseDonatesDao comActWarehouseDonatesDao;
    @Resource
    private ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;
    @Resource
    private ComActQuestnaireDAO comActQuestnaireDAO;
    @Resource
    private ComActDynDAO comActDynDAO;
    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @Override
    public R getResidentAutonomy(Long communityId) {
        ResidentAutonomyStatisticsVO statisticsVO = comActEasyPhotoDAO.selectResidentAutonomyStatistics(communityId);
        if (isNull(statisticsVO)) {
            statisticsVO = new ResidentAutonomyStatisticsVO();
        }
        List<ComActEasyPhotoVO> easyPhotoVOList = comActEasyPhotoDAO.selectStatisticsList(communityId);
        //随手拍总数
        Integer easyPhotoTotalCount = 0;
        //随手拍柱状统计
        List<StatisticsCommVO> easyPhotoHistogram = new ArrayList<>();
        if (Objects.nonNull(easyPhotoVOList) && !easyPhotoVOList.isEmpty()) {
            Map<String, List<ComActEasyPhotoVO>> easyPhotoVOMap = easyPhotoVOList.stream().collect(Collectors.groupingBy(ComActEasyPhotoVO::getClassifyName));
            for (Map.Entry<String, List<ComActEasyPhotoVO>> entry : easyPhotoVOMap.entrySet()) {
                StatisticsCommVO commVO = new StatisticsCommVO();
                commVO.setFiled(entry.getKey());
                commVO.setNum(entry.getValue().size());
                easyPhotoHistogram.add(commVO);
            }
            easyPhotoTotalCount = easyPhotoVOList.size();
        }
        statisticsVO.setEasyPhotoTotalCount(easyPhotoTotalCount);
        statisticsVO.setEasyPhotoHistogram(easyPhotoHistogram);
        //待实现&已实现数目及占比
        List<StatisticsCommVO> microWishRealizePercent = comActMicroWishDAO.selectRealizePercent(communityId);
        statisticsVO.setMicroWishRealizePercent(microWishRealizePercent);
        //微心愿图片
        List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, pageSize);
        statisticsVO.setMicroWishImages(microWishImages);
        //议事投票类型占比
        List<StatisticsCommVO> discussTypePercent = comActDiscussDAO.selectTypePercent(communityId);
        statisticsVO.setDiscussTypePercent(discussTypePercent);
        //议事标题
        List<String> discussTitles = comActDiscussDAO.getTitles(1, communityId, pageSize);
        statisticsVO.setDiscussTitles(discussTitles);
        //投票标题
        List<String> voteTitles = comActDiscussDAO.getTitles(2, communityId, pageSize);
        statisticsVO.setVoteTitles(voteTitles);
        //邻里圈图片
        List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, pageSize);
        statisticsVO.setNeighborImages(neighborImages);
        //邻里圈文本内容
        List<String> neighborContents = comActNeighborCircleDAO.getContents(communityId, pageSize);
        statisticsVO.setNeighborContents(neighborContents);
        //报事报修新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> repairAddPolylineData = comPropertyDao.getRepairPolylineDate(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = repairAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                repairAddPolylineData.add(other);
            }
        }
        repairAddPolylineData = repairAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsVO.setRepairAddPolylineData(repairAddPolylineData);
        //报事报修累计折线数据
        List<StatisticsCommVO> repairTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        repairAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.getRepairTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            repairTotalPolylineData.add(temp);
        });
        statisticsVO.setRepairTotalPolylineData(repairTotalPolylineData);
        //捐赠记录
        List<String> warehouseDonateRecords = comActWarehouseDonatesDao.getWarehouseDonateRecords(communityId, pageSize);
        statisticsVO.setWarehouseDonateRecords(warehouseDonateRecords);
        //爱心传递
        List<String> warehouseLoveTransfer = comActWarehouseDonatesDao.getWarehouseLoveTransfer(communityId, pageSize);
        statisticsVO.setWarehouseLoveTransfer(warehouseLoveTransfer);
        //捐赠图片
        List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, pageSize);
        statisticsVO.setWarehouseImages(warehouseImages);
        return R.ok(statisticsVO);
    }
    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @Override
    public R getGridsGovernance(Long communityId) {
        GridsGovernanceStatisticsVO statisticsVO = comActEasyPhotoDAO.selectGridsGovernance(communityId);
        if (isNull(statisticsVO)) {
            statisticsVO = new GridsGovernanceStatisticsVO();
        }
        // 查询网格数据
        List<EventGridStatisticsVO> gridStatisticsList = comMngPopulationDAO.getEventScreenGridData(communityId);
        statisticsVO.setGridStatisticsList(gridStatisticsList);
        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = comMngPopulationDAO.getCivilScreenVillageList(communityId);
        if (!villageStatisticsList.isEmpty()) {
            villageStatisticsList.forEach(village -> {
                CivilVillageStatisticsVO villageStatisticsVO =
                        comMngPopulationDAO.getCivilScreenVillageStatistics(village.getVillageId());
                if (villageStatisticsVO != null) {
                    village.setPeopleNum(villageStatisticsVO.getPeopleNum());
                    village.setHouseNum(villageStatisticsVO.getHouseNum());
                    village.setRegisterNum(villageStatisticsVO.getRegisterNum());
                    village.setFlowNum(villageStatisticsVO.getFlowNum());
                    // BeanUtils.copyProperties(villageStatisticsVO,village);
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageStatisticsList);
        // 查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = comMngPopulationDAO.getGridsGovernanceEventList(communityId);
        statisticsVO.setGridIncidentList(gridIncidentList);
        //事件分析新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> eventAddPolylineData = comPropertyDao.getEventAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = eventAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                eventAddPolylineData.add(other);
            }
        }
        eventAddPolylineData = eventAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsVO.setEventAddPolylineData(eventAddPolylineData);
        //事件分析累计折线数据
        List<StatisticsCommVO> eventTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        eventAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.getEventTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            eventTotalPolylineData.add(temp);
        });
        statisticsVO.setEventTotalPolylineData(eventTotalPolylineData);
        statisticsVO.generateStatisticsData();
        return R.ok(statisticsVO);
    }
    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @Override
    public R getCommunityServiceStatistics(Long communityId) {
        BigScreenCommunityStatisticsVO statisticsVO = new BigScreenCommunityStatisticsVO();
        // 查询网格数据
        List<EventGridStatisticsVO> gridStatisticsList = comMngPopulationDAO.getEventScreenGridData(communityId);
        statisticsVO.setGridStatisticsList(gridStatisticsList);
        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = comMngPopulationDAO.getCivilScreenVillageList(communityId);
        if (!villageStatisticsList.isEmpty()) {
            villageStatisticsList.forEach(village -> {
                CivilVillageStatisticsVO villageStatisticsVO =
                        comMngPopulationDAO.getCivilScreenVillageStatistics(village.getVillageId());
                if (villageStatisticsVO != null) {
                    village.setPeopleNum(villageStatisticsVO.getPeopleNum());
                    village.setHouseNum(villageStatisticsVO.getHouseNum());
                    village.setRegisterNum(villageStatisticsVO.getRegisterNum());
                    village.setFlowNum(villageStatisticsVO.getFlowNum());
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageStatisticsList);
        //商家地图点位数据
        List<ConvenientMerchantVO> merchantVOList = convenientMerchantDAO.selectMerchantListByCommunity(communityId);
        statisticsVO.setMerchantMapDataList(merchantVOList);
        return R.ok(statisticsVO);
    }
    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @Override
    public R getScreenPopularMerchants(PagePopularMerchantDTO pagePopularMerchantDTO) {
        Page page = new Page<>();
        page.setSize(pagePopularMerchantDTO.getPageSize());
        page.setCurrent(pagePopularMerchantDTO.getPageNum());
        List<ConvenientMerchantVO> popularMerchants = convenientMerchantDAO.getScreenPopularMerchants(page, pagePopularMerchantDTO);
        return R.ok(popularMerchants);
    }
    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @Override
    public R indexMicroWish(Long communityId) {
        BigScreenMicroWishStatisticsInfo statisticsInfo = comActMicroWishDAO.selectIndexMicroWishBaseData(communityId);
        //微心愿新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> microWishAddPolylineData = comActMicroWishDAO.getMicroWishAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = microWishAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                microWishAddPolylineData.add(other);
            }
        }
        microWishAddPolylineData = microWishAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setMicroWishAddPolylineData(microWishAddPolylineData);
        //微心愿累计折线数据
        List<StatisticsCommVO> microWishTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        microWishAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActMicroWishDAO.getMicroWishTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            microWishTotalPolylineData.add(temp);
        });
        statisticsInfo.setMicroWishTotalPolylineData(microWishTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @Override
    public R indexEasyPhoto(Long communityId) {
        BigScreenEasyPhotoStatisticsInfo statisticsInfo = comActEasyPhotoDAO.selectIndexEasyPhotoBaseData(communityId);
        //随手拍新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> easyPhotoAddPolylineData = comActEasyPhotoDAO.getEasyPhotoAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = easyPhotoAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                easyPhotoAddPolylineData.add(other);
            }
        }
        easyPhotoAddPolylineData = easyPhotoAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setEasyPhotoAddPolylineData(easyPhotoAddPolylineData);
        //随手拍累计折线数据
        List<StatisticsCommVO> easyPhotoTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        easyPhotoAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActEasyPhotoDAO.getEasyPhotoTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            easyPhotoTotalPolylineData.add(temp);
        });
        statisticsInfo.setEasyPhotoTotalPolylineData(easyPhotoTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @Override
    public R indexEasyPhotoList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActEasyPhotoDAO.indexEasyPhotoList(page, pageBaseDTO));
    }
    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @Override
    public R indexQuestionnaire(Long communityId) {
        BigScreenQuestionnaireStatisticsInfo statisticsInfo = comActQuestnaireDAO.getIndexQuestionnaireBaseData(communityId);
        //社区问卷新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> questionnaireAddPolylineData = comActQuestnaireDAO.getQuestionnaireAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = questionnaireAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                questionnaireAddPolylineData.add(other);
            }
        }
        questionnaireAddPolylineData = questionnaireAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setQuestionnaireAddPolylineData(questionnaireAddPolylineData);
        //社区问卷累计折线数据
        List<StatisticsCommVO> questionnaireTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        questionnaireAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActQuestnaireDAO.getQuestionnaireTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            questionnaireTotalPolylineData.add(temp);
        });
        statisticsInfo.setQuestionnaireTotalPolylineData(questionnaireTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @Override
    public R indexDyn(Long communityId) {
        BigScreenDynStatisticsInfo statisticsInfo = new BigScreenDynStatisticsInfo();
        List<StatisticsCommVO> dynCircleData = comActDynDAO.getIndexDynBaseData(communityId);
        statisticsInfo.setDynCircleData(dynCircleData);
        if (!dynCircleData.isEmpty()) {
            statisticsInfo.setDynNum(dynCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
        }
        //社区动态新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> dynAddPolylineData = comActDynDAO.getDynAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = dynAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                dynAddPolylineData.add(other);
            }
        }
        dynAddPolylineData = dynAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setDynAddPolylineData(dynAddPolylineData);
        //社区动态累计折线数据
        List<StatisticsCommVO> dynTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        dynAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActDynDAO.getDynTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            dynTotalPolylineData.add(temp);
        });
        statisticsInfo.setDynTotalPolylineData(dynTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexDynList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActDynDAO.indexDynList(page, pageBaseDTO));
    }
    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @Override
    public R indexNeighbor(Long communityId) {
        BigScreenNeighborStatisticsInfo statisticsInfo = new BigScreenNeighborStatisticsInfo();
        List<StatisticsCommVO> neighborCircleData = comActNeighborCircleDAO.getIndexNeighborBaseData(communityId);
        statisticsInfo.setNeighborCircleData(neighborCircleData);
        if (!neighborCircleData.isEmpty()) {
            statisticsInfo.setPublishContentNum(neighborCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
            statisticsInfo.setPublishTopicNum(neighborCircleData.size());
        }
        //邻里圈新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> neighborAddPolylineData = comActNeighborCircleDAO.getNeighborAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = neighborAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                neighborAddPolylineData.add(other);
            }
        }
        neighborAddPolylineData = neighborAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setNeighborAddPolylineData(neighborAddPolylineData);
        //邻里圈累计折线数据
        List<StatisticsCommVO> neighborTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        neighborAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActNeighborCircleDAO.getNeighborTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            neighborTotalPolylineData.add(temp);
        });
        statisticsInfo.setNeighborTotalPolylineData(neighborTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexNeighborList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActNeighborCircleDAO.indexNeighborList(page, pageBaseDTO));
    }
    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @Override
    public R indexMerchant(Long communityId) {
        BigScreenMerchantStatisticsInfo statisticsInfo = convenientMerchantDAO.getIndexMerchantBaseData(communityId);
        //资源类型饼图数据(暂无)
//        List<StatisticsCommVO> resourceTypeCircleData;
        //服务类型饼图数据
        List<StatisticsCommVO> serviceTypeCircleData = convenientMerchantDAO.selectServiceTypeCircleData(communityId);
        statisticsInfo.setServiceTypeCircleData(serviceTypeCircleData);
        if (!serviceTypeCircleData.isEmpty()) {
            //服务类型数
            statisticsInfo.setServiceTypeNum(serviceTypeCircleData.size());
        }
        //服务次数(目前暂时使用浏览量)新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> serviceTimesAddPolylineData = convenientMerchantDAO.getServiceTimesAddPolylineData(communityId);
        int currentMon = Integer.parseInt(new SimpleDateFormat("MM").format(nowDate));
        for (int i = 1; i <= currentMon; i++) {
            String temp;
            if (i > 9) {
                temp = "" + i;
            } else {
                temp = "0" + i;
            }
            boolean isExist = serviceTimesAddPolylineData.stream().anyMatch(e -> nonNull(e.getFiled()) &&
                    e.getFiled().endsWith(temp));
            if (!isExist) {
                StatisticsCommVO other = new StatisticsCommVO();
                other.setFiled(temp);
                other.setNum(0);
                serviceTimesAddPolylineData.add(other);
            }
        }
        serviceTimesAddPolylineData = serviceTimesAddPolylineData.stream().filter(e -> nonNull(e.getFiled()))
                .sorted(Comparator.comparing(e -> e.getFiled())).collect(Collectors.toList());
        statisticsInfo.setServiceTimesAddPolylineData(serviceTimesAddPolylineData);
        //服务次数(目前暂时使用浏览量)累计折线数据
        List<StatisticsCommVO> serviceTimesTotalPolylineData = new ArrayList<>();
        String year = new SimpleDateFormat("yyyy").format(nowDate);
        serviceTimesAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = convenientMerchantDAO.getServiceTimesTotalPolylineDate(communityId, year + e.getFiled());
            temp.setFiled(e.getFiled());
            serviceTimesTotalPolylineData.add(temp);
        });
        statisticsInfo.setServiceTimesTotalPolylineData(serviceTimesTotalPolylineData);
        return R.ok(statisticsInfo);
    }
    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexMerchantList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(convenientMerchantDAO.indexMerchantList(page, pageBaseDTO));
    }
    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexMicroWishList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActMicroWishDAO.selectScreenDisplayList(page, pageBaseDTO));
    }
    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexQuestionnaireList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActQuestnaireDAO.selectQuestionnaireDisplayList(page, pageBaseDTO));
    }
    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();
        Page page = new Page<>();
        if (nonNull(pageNum) && nonNull(size)) {
            page.setCurrent(pageNum);
            page.setSize(size);
        } else {
            page.setCurrent(1);
            page.setSize(pageSize);
        }
        return page;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
@@ -6,7 +6,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -21,6 +20,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.MyActivityEvaluateVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
@@ -75,7 +75,9 @@
            //需要签到类型
            int registCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, activityId));
            if (registCount <= 0) {
            int evaluateCount = this.baseMapper.selectCount(new QueryWrapper<ComActActEvaluateDO>().lambda()
                    .eq(ComActActEvaluateDO::getUserId, userId).eq(ComActActEvaluateDO::getActivityId, activityId));
            if (registCount <= evaluateCount) {
                //未签到,不能评价
                return R.fail("未签到,不能评价");
            }
@@ -83,11 +85,6 @@
            if (nowDate.before(beginAt)) {
                return R.fail("活动还未开始,暂不支持评价");
            }
        }
        ComActActEvaluateDO currentUserEvaluateForThisActivity = this.baseMapper.selectOne(new QueryWrapper<ComActActEvaluateDO>()
                .lambda().eq(ComActActEvaluateDO::getActivityId, activityId).eq(ComActActEvaluateDO::getUserId, userId));
        if (Objects.nonNull(currentUserEvaluateForThisActivity)) {
            return R.fail("该用户已评论过了,请勿重复评论");
        }
        ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO();
        BeanUtils.copyProperties(comActActEvaluateVO, comActActEvaluateDO);
@@ -150,7 +147,7 @@
    public R listEvaluate(Long userId) {
        List<ComActActEvaluateDO> comActActEvaluateDOList = this.baseMapper.selectList(new QueryWrapper<ComActActEvaluateDO>()
                .lambda().eq(ComActActEvaluateDO::getUserId, userId));
        ArrayList<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>();
        List<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) {
            comActActEvaluateDOList.forEach(comActActEvaluateDO -> {
                ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO();
@@ -160,4 +157,28 @@
        }
        return R.ok(comActActEvaluateVOS);
    }
    /**
     * 我的评价
     * @param userId
     * @param activityId
     * @return
     */
    @Override
    public R listMyActivityEvaluate(Long userId, Long activityId) {
        ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
        if (isNull(comActActivityDO)) {
            return R.fail("活动不存在");
        }
        List<ComActActEvaluateVO> comActActEvaluateVOS = this.baseMapper.selectEvaluateList(activityId, userId);
        int regCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
        MyActivityEvaluateVO evaluateVO = new MyActivityEvaluateVO();
        evaluateVO.setMyEvaluateList(comActActEvaluateVOS);
        boolean needDisplay = regCount > comActActEvaluateVOS.size() &&
                new Date().before(DateUtils.addDays(comActActivityDO.getEndAt(), 3));
        evaluateVO.setIsDisplay(needDisplay ? 1 : 0);
        return R.ok(evaluateVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityCodeServiceImpl.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.dao.ComActActivityCodeDao;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 签到二维码表(ComActActivityCode)表服务实现类
 *
 * @author makejava
 * @since 2021-10-15 15:23:10
 */
@Slf4j
@Service
public class ComActActivityCodeServiceImpl extends ServiceImpl<ComActActivityCodeDao, ComActActivityCode> implements ComActActivityCodeService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1,14 +1,18 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -28,8 +32,10 @@
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.HttpStatus;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -38,6 +44,7 @@
import com.panzhihua.common.model.vos.community.ComActActPictureVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
@@ -50,13 +57,18 @@
import com.panzhihua.service_community.dao.ComActActPictureDAO;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityCodeDao;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComBpActivityDAO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import com.panzhihua.service_community.model.dos.ComActActPictureDO;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
import lombok.extern.slf4j.Slf4j;
@@ -86,6 +98,14 @@
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private ComActActPictureDAO comActActPictureDAO;
    @Resource
    private ComActActivityCodeDao comActActivityCodeDao;
    @Resource
    private ComBpActivityDAO comBpActivityDAO;
    @Resource
    private ComActIntegralUserTradeService comActIntegralUserTradeService;
    @Resource
    private ComActActivityCodeService comActActivityCodeService;
    /**
     * 新增社区活动
@@ -96,6 +116,9 @@
     */
    @Override
    public R addActivity(ComActActivityVO comActActivityVO) {
        if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
            comActActivityVO.setRewardWay(null);
        }
        ComActActivityDO comActActivityDO = new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO, comActActivityDO);
        Integer status = comActActivityVO.getStatus();
@@ -130,6 +153,13 @@
        comActActPictureDO.setUploadPicture(comActActivityVO.getCover());
        comActActPictureDO.setSysFlag(0);
        comActActPictureDAO.insert(comActActPictureDO);
        ComActActivityCode comActActivityCode = new ComActActivityCode();
        comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
        comActActivityCode.setCreateTime(new Date());
        comActActivityCode.setType(1);
        comActActivityCode.setStatus(1);
        comActActivityCodeService.save(comActActivityCode);
        return R.ok(activityId);
    }
@@ -174,11 +204,15 @@
                }
            }
        }
        if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
            comActActivityVO.setRewardWay(null);
        }
        BeanUtils.copyProperties(comActActivityVO, comActActivityDO);
        // 结束时间大于当前时间则设置为“进行中”
        Date now = new Date();
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()
        && now.getTime() > comActActivityVO.getSignUpBegin().getTime()) {
            comActActivityDO.setStatus(3);
        }
        boolean b = this.updateById(comActActivityDO);
@@ -252,8 +286,7 @@
     */
    @Override
    public R cancelActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO = new ComActActivityDO();
        comActActivityDO.setId(comActActivityVO.getId());
        ComActActivityDO comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
        comActActivityDO.setStatus(comActActivityVO.getStatus());
        comActActivityDO.setCancelReason(comActActivityVO.getCancelReason());
        int update = comActActivityDAO.updateById(comActActivityDO);
@@ -279,13 +312,21 @@
                LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
                actSignQuery.eq(ComActActSignDO::getActivityId, id);
                actSignQuery.eq(ComActActSignDO::getUserId, userId);
                actSignQuery.eq(ComActActSignDO::getStatus, 1);
                ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
                if (!ObjectUtils.isEmpty(comActActSignDO)) {
                    comActActivityVO.setIsSign(1);
                    comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                }
                List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
                        .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
                if (!regList.isEmpty()) {
                    List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
                    comActActivityVO.setTimes(collect.get(0).getTimes());
                }
            }
        }
        comActActivityVO.setCodeType(1);
        return comActActivityVO;
    }
@@ -429,70 +470,124 @@
        Long activityId = signactivityVO.getActivityId();
        Integer type = signactivityVO.getType();
        Long userId = signactivityVO.getUserId();
        Integer isVolunteer = signactivityVO.getIsVolunteer();
        Integer isVolunteer = 0;
        // 查询社区活动
        ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
        if (isNull(actActivityDO)) {
            return R.fail("活动不存在");
        }
        int num = 0;
        ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
                .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
        if (1 == type) {
            if (nonNull(comActActSignDO) && comActActSignDO.getStatus().equals(1)) {
                return R.fail("已经报名过了,请勿重复提交");
            }
            Integer volunteerMax = actActivityDO.getVolunteerMax();
            Integer residentMax = actActivityDO.getParticipantMax();
            R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
            LoginUserInfoVO loginUserInfoVO =
                JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
            boolean userNotVolunteer = !(loginUserInfoVO.getIsVolunteer() == 1);
            if (isVolunteer == 1 && userNotVolunteer) {
                return R.fail("只有志愿者才能报名");
            }
            // 查询当前活动下参与志愿者/居民数量
            Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
            if (isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count
                && !actActivityDO.getVolunteerMax().equals(-1)) {
                return R.fail("志愿者报名人数已满");
            }
            //审查用户是否有该活动报名权限(是否活动指定参与人群)
            String currentUserTags = loginUserInfoVO.getTags();
            String attendPeople = actActivityDO.getAattendPeople();
            if (isVolunteer.intValue() == 0 && isNotBlank(attendPeople)) {
                if (isBlank(currentUserTags)) {
                    currentUserTags = "全部居民";
                    JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
            // 查询当前活动下参与居民
            Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
            if (volunteerMax != 0) {
                //志愿者活动
                boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
                // 查询当前活动下参与志愿者
                Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                        .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1).eq(ComActActSignDO::getStatus, 1));
                if (userIsVolunteer) {
                    //用户是志愿者以志愿者身份参加
                    if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
                        //以志愿者身份报名
                        isVolunteer = 1;
                    } else if (nonNull(residentMax) && (residentMax > residentCount || residentMax.equals(-1))) {
                        //志愿者报名人数已满,再以居民身份报名参加
                        isVolunteer = 0;
                    } else {
                        return R.fail("报名人数已满");
                    }
                } else {
                    currentUserTags = currentUserTags.concat(",全部居民");
                    //用户是普通居民已居民身份参加
                    if (nonNull(residentMax) && (residentMax > residentCount || residentMax.equals(-1))) {
                        //以居民身份报名参加
                        isVolunteer = 0;
                    } else if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
                        return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者哦~");
                    } else {
                        return R.fail("报名人数已满");
                    }
                }
                List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
                boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
                if (!checkResult) {
                    return R.fail("您不是指定参与人群!");
            } else {
                //普通居民活动
                //审查用户是否有该活动报名权限(是否活动指定参与人群)
                String currentUserTags = loginUserInfoVO.getTags();
                String attendPeople = actActivityDO.getAattendPeople();
                if (isNotBlank(attendPeople)) {
                    if (isBlank(currentUserTags)) {
                        currentUserTags = "全部居民";
                    } else {
                        currentUserTags = currentUserTags.concat(",全部居民");
                    }
                    List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
                    boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
                    if (!checkResult) {
                        return R.fail("您不是指定参与人群!");
                    }
                }
                if (residentMax > residentCount || residentMax.equals(-1)) {
                    //用户参加居民活动
                    isVolunteer = 0;
                } else {
                    return R.fail("报名人数已满");
                }
            }
            if (isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count
                && !actActivityDO.getParticipantMax().equals(-1)) {
                return R.fail("居民报名人数已满");
            }
            ComActActSignDO comActActSignDO = new ComActActSignDO();
            comActActSignDO.setActivityId(activityId);
            comActActSignDO.setUserId(userId);
            comActActSignDO.setIsVolunteer(isVolunteer);
            try {
            if (nonNull(comActActSignDO)) {
                comActActSignDO.setStatus(1);
                comActActSignDO.setCreateAt(new Date());
                comActActSignDO.setReason(null);
                comActActSignDO.setIsVolunteer(isVolunteer);
                num = comActActSignDAO.updateById(comActActSignDO);
            } else {
                comActActSignDO = new ComActActSignDO();
                comActActSignDO.setActivityId(activityId);
                comActActSignDO.setUserId(userId);
                comActActSignDO.setIsVolunteer(isVolunteer);
                num = comActActSignDAO.insert(comActActSignDO);
            } catch (Exception e) {
                if (e.getMessage().contains("unique_activity_id_user_id")) {
                    return R.fail("已经报名过了,请勿重复提交");
                }
                log.error(e.getMessage());
            }
        } else {
            num = comActActSignDAO
                .delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId)
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
            Integer regTimes = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
                    .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getType, 1));
            Integer canCancel = actActivityDO.getCanCancel();
            if (nonNull(canCancel) && canCancel.equals(2)) {
                return R.fail("该活动暂不支持取消");
            }
            if (regTimes > 0) {
                return R.fail("您已参与活动,不可取消");
            }
            if (isNull(signactivityVO.getReason())) {
                return R.fail("缺少取消原因");
            }
            if (isNull(comActActSignDO)) {
                return R.fail("未报名");
            }
            comActActSignDO.setStatus(0);
            comActActSignDO.setReason(signactivityVO.getReason());
            num = comActActSignDAO.updateById(comActActSignDO);
            if (num > 0) {
                AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
                addComActIntegralUserDTO.setUserId(userId);
                addComActIntegralUserDTO.setIntegralType(8);
                addComActIntegralUserDTO.setActivityType(1);
                addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
                addComActIntegralUserDTO.setServiceId(activityId);
                comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
            }
        }
        if (num > 0) {
            return R.ok();
            return R.ok(isVolunteer);
        }
        return R.fail();
    }
@@ -502,41 +597,60 @@
     *
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    @Override
    public R listActivity(Long userId) {
        List<ComActActSignDO> comActActSignDOS = comActActSignDAO
            .selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActActSignDOS)) {
    public R listActivity(Long userId, Integer status) {
        List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
        if (ObjectUtils.isEmpty(activitySignVOList)) {
            return R.fail();
        }
        List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId())
        List<Long> longs = activitySignVOList.stream().map(activitySignVO -> activitySignVO.getActivityId())
            .collect(Collectors.toList());
        List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        comActActivityDOS.forEach(comActActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
            List<ComActActSignDO> collect = comActActSignDOS.stream()
                .filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1)
                .collect(Collectors.toList());
            ComActActSignDO comActActSignDO = collect.get(0);
            Integer isVolunteer = comActActSignDO.getIsVolunteer();
            if (isVolunteer.intValue() == 1) {
                comActActivityVO.setType(1);
            } else {
                comActActivityVO.setType(2);
        if (nonNull(status)) {
            if(status.equals(4)){
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(3)||activityDO.getStatus().equals(4)).collect(Collectors.toList());
            }else{
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            }
            Integer status = comActActivityVO.getStatus();
            if (status.intValue() == 3) {
                comActActivityVO.setStatus(4);
            }
            comActActivityVO.setSingDate(comActActSignDOS.stream()
                .filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId()))
                .collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVOS.add(comActActivityVO);
        });
        }
        if (!comActActivityDOS.isEmpty()) {
            comActActivityDOS.forEach(comActActivityDO -> {
                ComActActivityVO comActActivityVO = new ComActActivityVO();
                BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
                List<ActivitySignVO> collect = activitySignVOList.stream()
                        .filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId())).limit(1)
                        .collect(Collectors.toList());
                ActivitySignVO activitySignVO = collect.get(0);
                Integer isVolunteer = activitySignVO.getIsVolunteer();
                if (isVolunteer.intValue() == 1) {
                    comActActivityVO.setType(1);
                } else {
                    comActActivityVO.setType(2);
                }
                Integer activityStatus = comActActivityVO.getStatus();
                if (activityStatus.intValue() == 3) {
                    comActActivityVO.setStatus(4);
                }
                Date createAt = null;
                try {
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    createAt = simpleDateFormat.parse(activitySignVO.getCreateAt());
                } catch (ParseException e) {
                    log.error("时间转换异常【{}】", e.getMessage());
                }
                comActActivityVO.setSingDate(createAt);
                comActActivityVO.setTimes(activitySignVO.getTimes());
                Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
                comActActivityVO.setAward(totalAward);
                comActActivityVOS.add(comActActivityVO);
            });
        }
        return R.ok(comActActivityVOS);
    }
@@ -788,40 +902,125 @@
        if (isNull(activityId)) {
            return R.fail("签到所属活动id不能为空!");
        }
        ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
        if (isNull(comActActivityDO)) {
            return R.fail("活动不存在!");
        }
        if(comActActRegistVO.getActivityType()==1){
            ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
            if (isNull(comActActivityDO)) {
                return R.fail("活动不存在!");
            }
        Date beginAt = comActActivityDO.getBeginAt();
        Date endAt = comActActivityDO.getEndAt();
        Date nowDate = new Date();
        if (nowDate.before(beginAt) || nowDate.after(endAt)) {
            return R.fail("不在活动时间范围内");
        }
            ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getStatus, 1));
            if (isNull(comActActSignDO)) {
                return R.fail("活动未报名");
            }
        int signCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
            Date beginAt = comActActivityDO.getBeginAt();
            Date endAt = comActActivityDO.getEndAt();
            Date nowDate = new Date();
            if (nowDate.before(beginAt) || nowDate.after(endAt)) {
                return R.fail("不在活动时间范围内");
            }
        if (signCount > 0) {
            return R.fail("请勿重复签到");
        }
            int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
            int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
            if (signDayCount > 0) {
                return R.fail("请扫描新的签到码");
            }
            Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
            boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
            if (isHave) {
                int limit = comActActivityDO.getLimit().intValue();
                if(limit != -1 && signAllCount >= limit){
                    return R.fail("签到次数上限");
                }
            }
//        String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
//        if (stringRedisTemplate.hasKey(activitySignInKey)) {
//            return R.fail("你已签到,如要再次签到请三十分钟后尝试!");
//        }
        ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
        comActActRegistDO.setActivityId(activityId);
        comActActRegistDO.setUserId(userId);
        comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
        comActActRegistDO.setCreateAt(nowDate);
        int result = comActActRegistDAO.insert(comActActRegistDO);
        if (result > 0) {
//            ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
//            opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
            return R.ok();
            ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
            comActActRegistDO.setActivityId(activityId);
            comActActRegistDO.setType(1);
            comActActRegistDO.setUserId(userId);
            comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
            comActActRegistDO.setCreateAt(nowDate);
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setTimes(signAllCount+1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {
                if (isHave) {
                    boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                    AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                    addComActIntegralUserDTO.setUserId(userId);
                    addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                    addComActIntegralUserDTO.setActivityType(1);
                    addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                    addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                    addComActIntegralUserDTO.setServiceId(activityId);
                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                    return R.ok(comActActivityDO.getRewardIntegral());
                } else {
                    return R.ok();
                }
            }
            return R.fail("网络错误,请重试");
        }
//        else {
//            ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
//            if (isNull(comPbActivityDO)) {
//                return R.fail("活动不存在!");
//            }
//
//            Date beginAt = comPbActivityDO.getActivityTimeBegin();
//            Date endAt = comPbActivityDO.getActivityTimeEnd();
//            Date nowDate = new Date();
//            if (nowDate.before(beginAt) || nowDate.after(endAt)) {
//                return R.fail("不在活动时间范围内");
//            }
//
//            int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
//                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
//            int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
//                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
//            if (signDayCount >= 0) {
//                return R.fail("请扫描新的签到码");
//            }
//            int limit = comPbActivityDO.getLimit().intValue();
//            if(limit != -1 && signAllCount >= limit){
//                return R.fail("签到次数上限");
//            }
//
//            ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
//            comActActRegistDO.setActivityId(activityId);
//            comActActRegistDO.setType(2);
//            comActActRegistDO.setUserId(userId);
//            comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
//            comActActRegistDO.setCreateAt(nowDate);
//            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
//            comActActRegistDO.setAward(comPbActivityDO.getRewardIntegral());
//            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
//            comActActRegistDO.setTimes(signAllCount+1);
//            int result = comActActRegistDAO.insert(comActActRegistDO);
//            if (result > 0) {
//                AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
//                addComActIntegralUserDTO.setUserId(userId);
//                addComActIntegralUserDTO.setIntegralType(8);
//                addComActIntegralUserDTO.setActivityType(2);
//                addComActIntegralUserDTO.setCommunityId(comPbActivityDO.getCommunityId());
//                addComActIntegralUserDTO.setServiceId(activityId);
//                comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
////            ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
////            opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
//                return R.ok();
//            }
//            return R.fail("网络错误,请重试");
//        }
        return R.fail("网络错误,请重试");
    }
@@ -843,4 +1042,52 @@
        });
        return R.ok(comActActRegistVOS);
    }
    /**
     * 获取活动报名签到记录
     * @param id 活动主键id
     * @return
     */
    @Override
    public R listSignInRecord(Long id) {
        return R.ok(comActActSignDAO.listSignInRecord(id));
    }
    /**
     * 活动签到记录
     * @param id 活动主键
     * @param userId 用户id
     * @return
     */
    @Override
    public R listRegistRecord(Long id, Long userId) {
        return R.ok(comActActRegistDAO.listRegistRecord(id, userId));
    }
    /**
     * 获取活动类型(目前只有志愿者活动需要获取)
     * @param communityId
     * @param type
     * @return
     */
    @Override
    public R listActivityType(Long communityId, Integer type) {
        return R.ok(this.baseMapper.listActivityType(communityId, type));
    }
    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    @Override
    public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
        try {
            this.baseMapper.addActivityType(comActActivityTypeVO);
        } catch (Exception e) {
            log.error("添加活动类型错误【{}】", e.getMessage());
            return R.fail("活动类型已存在");
        }
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAnnouncementServiceImpl.java
New file
@@ -0,0 +1,30 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.service.ComActAnnouncementService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * (ComActAnnouncement)表服务实现类
 *
 * @author makejava
 * @since 2021-11-01 13:45:55
 */
@Slf4j
@Service
public class ComActAnnouncementServiceImpl extends ServiceImpl<ComActAnnouncementDao, ComActAnnouncement> implements ComActAnnouncementService {
    @Resource
    private ComActAnnouncementDao comActAnnouncementDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActAnnouncementDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
@@ -1,9 +1,12 @@
package com.panzhihua.service_community.service.impl;
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
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.service.ComActColumnService;
@@ -16,15 +19,26 @@
 * 分类列表(ComActColumn)表服务实现类
 *
 * @author makejava
 * @since 2021-10-20 17:28:13
 * @since 2021-11-01 14:38:25
 */
@Slf4j
@Service
public class ComActColumnServiceImpl extends ServiceImpl<ComActColumnDao, ComActColumn> implements ComActColumnService {
    @Resource
    private ComActColumnDao comActColumnDao;
    @Resource
    private ComActAnnouncementDao comActAnnouncementDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActColumnDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }
    @Override
    public R delete(Long id) {
        if(!comActAnnouncementDao.selectList(new QueryWrapper<ComActAnnouncement>().lambda().eq(ComActAnnouncement::getColumnId,id)).isEmpty()){
            return R.fail("当前类型无法删除,请先处理绑定数据");
        }
        return R.ok(comActColumnDao.deleteById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -694,6 +695,11 @@
        if(!comActReserveIndexApplicationVos.isEmpty()){
            easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
        }
        //查询banner
        List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.banner(communityId);
        if(!bannerVOS.isEmpty()){
            easyPhotoRewardVO.setBannerVOS(bannerVOS);
        }
        return R.ok(easyPhotoRewardVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
@@ -186,11 +186,11 @@
    }
    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @Override
    public R getTaskActivityPeopleList(Long activityId) {
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.dao.ComBpActivityDAO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +28,8 @@
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.nonNull;
/**
 * @auther lyq
@@ -56,6 +59,8 @@
    private ComActDiscussOptionService comActDiscussOptionService;
    @Resource
    private ComActActivityService comActActivityService;
    @Resource
    private ComBpActivityDAO comBpActivityDAO;
    /**
     * 查询用户某个时间段交易数量
@@ -170,7 +175,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addIntegralTradeAdmin(AddComActIntegralUserDTO integralUserDTO) {
        // 判断增加积分类型 积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)
        // 判断增加积分类型 积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动)
        Integer type = integralUserDTO.getIntegralType();
        // 业务id
        Long serviceId = integralUserDTO.getServiceId();
@@ -187,24 +192,30 @@
        // 当前时间
        Date nowDate = new Date();
        // 查询随手拍增加积分数量
        ComActIntegralRuleDO integralRuleDO =
            comActIntegralRuleService.getOne(new QueryWrapper<ComActIntegralRuleDO>().lambda()
                .eq(ComActIntegralRuleDO::getIntegralType, type).eq(ComActIntegralRuleDO::getCommunityId, communityId));
        if (integralRuleDO == null) {
            log.error("未查询到该社区积分规则,社区id:" + communityId);
            return R.fail("未查询到该社区积分规则,社区id:" + communityId);
        }
        // 判断规则是否有次数限制
        if (integralRuleDO.getIsRestrict().equals(ComActIntegralRuleDO.isRestrict.yes)) {
            Integer count = this.baseMapper.getIntegralCount(
                getIntegralCountDTO(integralRuleDO.getType(), userId, communityId, integralRuleDO.getIntegralType()));
            if (count >= integralRuleDO.getCount()) {
                log.error("该用户参加任务次数已达上限");
                return R.fail("该用户参加任务次数已达上限");
        Integer changeType = ComActIntegralUserTradeDO.changeType.add;
        Integer isVolunteer = integralUserDTO.getIsVolunteer();
        if (!type.equals(8)) {
            // 查询随手拍增加积分数量
            ComActIntegralRuleDO integralRuleDO =
                    comActIntegralRuleService.getOne(new QueryWrapper<ComActIntegralRuleDO>().lambda()
                            .eq(ComActIntegralRuleDO::getIntegralType, type).eq(ComActIntegralRuleDO::getCommunityId, communityId));
            if (integralRuleDO == null) {
                log.error("未查询到该社区积分规则,社区id:" + communityId);
                return R.fail("未查询到该社区积分规则,社区id:" + communityId);
            }
            // 判断规则是否有次数限制
            if (integralRuleDO.getIsRestrict().equals(ComActIntegralRuleDO.isRestrict.yes)) {
                Integer count = this.baseMapper.getIntegralCount(
                        getIntegralCountDTO(integralRuleDO.getType(), userId, communityId, integralRuleDO.getIntegralType()));
                if (count >= integralRuleDO.getCount()) {
                    log.error("该用户参加任务次数已达上限");
                    return R.fail("该用户参加任务次数已达上限");
                }
            }
            amount = integralRuleDO.getAmount();
        }
        amount = integralRuleDO.getAmount();
        switch (type) {
            case 1:
@@ -247,27 +258,32 @@
                }
                break;
            case 4:
                identityType = 3;
                remark.append("参与志愿者活动奖励积分");
                ComActActivityDO actActivityZYZDO = comActActivityService.getById(serviceId);
                if (actActivityZYZDO != null) {
                    remark.append("【");
                    remark.append(actActivityZYZDO.getActivityName());
                    remark.append("】");
                if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
                    identityType = 3;
                } else {
                    identityType = 1;
                }
                remark.append("成功参加居民活动奖励积分");
                ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
                if(actActivityDO1 != null) {
                    amount = actActivityDO1.getRewardIntegral();
                }
                break;
            case 5:
                remark.append("参与社区活动奖励积分");
                if (nonNull(isVolunteer) && isVolunteer.equals(0)) {
                    identityType = 1;
                } else {
                    identityType = 3;
                }
                remark.append("成功参加志愿者活动奖励积分");
                ComActActivityDO actActivityDO = comActActivityService.getById(serviceId);
                if (actActivityDO != null) {
                    remark.append("【");
                    remark.append(actActivityDO.getActivityName());
                    remark.append("】");
                if(actActivityDO != null) {
                    amount = actActivityDO.getRewardIntegral();
                }
                break;
            case 6:
                identityType = 2;
                remark.append("参与党员活动奖励积分");
                remark.append("参与党员活动");
                break;
            case 7:
                // 查询调查问卷
@@ -296,6 +312,32 @@
                remark.append("【");
                remark.append(questnaireDO.getTitle());
                remark.append("】");
                break;
            case 8:
                changeType = ComActIntegralUserTradeDO.changeType.reduce;
                if (integralUserDTO.getActivityType() == 1) {
                    ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
                    if (actActivityDO2 != null) {
                        amount = -actActivityDO2.getCancelDeduct();
                        if (actActivityDO2.getVolunteerMax() != 0) {
                            remark.append("取消志愿者活动扣除积分");
                        } else {
                            remark.append("取消居民活动扣除积分");
                        }
                    }
                    if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
                        identityType = 3;
                    } else {
                        identityType = 1;
                    }
                }
//                else {
//                    ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
//                    if(comPbActivityDO!=null){
//                        amount=comPbActivityDO.getRewardIntegral();
//                        identityType=2;
//                    }
//                }
                break;
            default:
                break;
@@ -344,25 +386,45 @@
        Integer integralAvailableResident = integralUserDO.getIntegralAvailableResident();
        Integer integralFrozenResident = integralUserDO.getIntegralFrozenResident();
        integralUserDO.setIntegralSum(integralUserDO.getIntegralSum() + amount);
        integralUserDO.setIntegralAvailableSum(integralUserDO.getIntegralAvailableSum() + amount);
        integralUserDO.setUpdateAt(nowDate);
        // 根据不同身份,计算钱包金额
        int reduceAmount = 0;
        if (identityType.equals(ComActIntegralUserTradeDO.identityType.jm)) {
            integralUserDO.setIntegralResident(integralUserDO.getIntegralResident() + amount);
            integralUserDO.setIntegralAvailableResident(integralUserDO.getIntegralAvailableResident() + amount);
            int integralResidentNow = addIntegral(integralResident + amount);
            if (amount < 0) {
                reduceAmount = integralResident - integralResidentNow;
            }
            integralUserDO.setIntegralResident(integralResidentNow);
            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.dy)) {
            integralUserDO.setIntegralParty(integralUserDO.getIntegralParty() + amount);
            integralUserDO.setIntegralAvailableParty(integralUserDO.getIntegralAvailableParty() + amount);
            int integralPartyNow = addIntegral(integralParty + amount);
            if (amount < 0) {
                reduceAmount = integralParty - integralPartyNow;
            }
            integralUserDO.setIntegralParty(integralPartyNow);
            integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) {
            integralUserDO.setIntegralVolunteer(integralUserDO.getIntegralVolunteer() + amount);
            integralUserDO.setIntegralAvailableVolunteer(integralUserDO.getIntegralAvailableVolunteer() + amount);
            int integralVolunteerNow = addIntegral(integralVolunteer + amount);
            if (amount < 0) {
                reduceAmount = integralVolunteer - integralVolunteerNow;
            }
            integralUserDO.setIntegralVolunteer(integralVolunteerNow);
            integralUserDO.setIntegralAvailableVolunteer(addIntegral(integralUserDO.getIntegralAvailableVolunteer() + amount));
        }
        if (changeType == ComActIntegralUserTradeDO.changeType.reduce) {
            amount = reduceAmount;
            integralUserDO.setIntegralSum(addIntegral(integralSum - reduceAmount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - reduceAmount));
        } else {
            integralUserDO.setIntegralSum(addIntegral(integralSum + amount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount));
        }
        integralUserDO.setUpdateAt(nowDate);
        // 更新钱包
        comActIntegralUserService.updateById(integralUserDO);
        // 增加积分账户交易记录
        Long tradeId = this.addIntegralTradeRecord(userId, integralId, communityId, serviceId, type, amount,
            ComActIntegralUserTradeDO.changeType.add, remark.toString(), identityType, 2L);
                changeType, remark.toString(), identityType, 2L);
        // 增加积分账户变更记录
        comActIntegralUserChangeService.addIntegralUserChangeRecord(userId, integralId, communityId, integralSum,
            integralUserDO.getIntegralSum(), integralAvailableSum, integralUserDO.getIntegralAvailableSum(),
@@ -376,6 +438,10 @@
        return R.ok();
    }
    private int addIntegral(int integral) {
        return integral > 0 ? integral : 0;
    }
    /**
     * 根据类型、用户id、社区id构建查询请求参数
     * 
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActPictureLibraryServiceImpl.java
New file
@@ -0,0 +1,38 @@
package com.panzhihua.service_community.service.impl;
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActPictureLibraryVO;
import org.springframework.stereotype.Service;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActPictureLibraryDAO;
import com.panzhihua.service_community.service.ComActPictureLibraryService;
/**
 * @title: ComActPictureLibraryServiceImpl
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 公共预设图库服务实现类
 * @author: hans
 * @date: 2021/11/23 17:03
 */
@Service
public class ComActPictureLibraryServiceImpl implements ComActPictureLibraryService {
    @Resource
    private ComActPictureLibraryDAO comActPictureLibraryDAO;
    /**
     * 获取预设图库
     * @param type
     * @param subtype
     * @return
     */
    @Override
    public R getPresetPictureLibrary(Integer type, Integer subtype) {
        ComActPictureLibraryVO libraryVO = new ComActPictureLibraryVO();
        libraryVO.setPresetPictures(comActPictureLibraryDAO.getPresetPictureLibrary(type, subtype));
        return R.ok(libraryVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -1,5 +1,23 @@
package com.panzhihua.service_community.service.impl;
import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import javax.xml.bind.DatatypeConverter;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO;
import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,25 +27,18 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRecordListVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterStatisticsVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper;
import com.panzhihua.service_community.dao.ComActReserveSubMapper;
import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO;
import com.panzhihua.service_community.model.dos.ComActQuestnaireSubDO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
import com.panzhihua.service_community.service.ComActReserveSubService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import lombok.extern.slf4j.Slf4j;
/**
 * @auther lyq
@@ -40,31 +51,21 @@
    @Resource
    private ComActReserveSubMapper comActReserveSubMapper;
    @Resource
    private ComActReserveRecordMapper comActReserveRecordMapper;
    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @param pageReserveRegisterDetailedAdminDTO 登记id
     * @return  登记明细数据
     */
    @Override
    public R exportRegisterAdmin(Long reserveId){
    public R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
        QuestnaireAnswersDTO result = new QuestnaireAnswersDTO();
        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
                .eq(ComActReserveSubDO::getReserveId, reserveId).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(5)){
                ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
                BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
                listSubVo.add(comActQuestnaireSubVO);
            }
        });
        result.setSubs(listSubVo);
        result.setSubs(retrieveQuestnaireSub(pageReserveRegisterDetailedAdminDTO));
        //查询用户回答
        List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId);
        List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO);
        result.setAnswers(vos);
        return R.ok(result);
@@ -92,6 +93,8 @@
                //渲染序号
                HashMap<String,String> map = new HashMap<>();
                map.put("nub",nub + "");
                //渲染登记时间
                map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
                //渲染用户昵称
                map.put("nickName",registerDetailed.getNickName());
                //查询记录填写答案并装载到数据集中
@@ -116,8 +119,6 @@
                }
                //渲染登记流水号
                map.put("id",registerDetailed.getId() + "");
                //渲染登记时间
                map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
                resultMapList.add(map);
                nub++;
            }
@@ -125,4 +126,236 @@
        resultPage.setRecords(resultMapList);
        return R.ok(resultPage);
    }
    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @Override
    public R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        IPage<HashMap<String,String>> resultPage = new Page<>();
        Page page = new Page(detailedAdminDTO.getPageNum(), detailedAdminDTO.getPageSize());
        IPage<String> statisticsVOIPage = this.baseMapper.pageRegisterHomeQuarantine(page, detailedAdminDTO);
        resultPage.setCurrent(statisticsVOIPage.getCurrent());
        resultPage.setTotal(statisticsVOIPage.getTotal());
        resultPage.setSize(statisticsVOIPage.getSize());
        resultPage.setPages(statisticsVOIPage.getPages());
        List<String> records = statisticsVOIPage.getRecords();
        List<HashMap<String,String>> resultMapList = new ArrayList<>();
        if (!records.isEmpty()) {
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            int nub = 1;
            for (String record : records) {
                //渲染序号
                HashMap<String,String> map = new HashMap<>();
                map.put("nub", nub + "");
                List<HomeQuarantineRegisterStatisticsVO> statisticsList = this.baseMapper.selectStatistics(detailedAdminDTO.getReserveId(), record);
                StringBuffer conditions = new StringBuffer();
                //渲染首次登记时间
                map.put("time", DateUtils.format(statisticsList.get(0).getCreateAt(), DateUtils.ymdhms_format));
                statisticsList.forEach(e -> {
                    String reserveSubContent = e.getReserveSubContent();
                    String dateString = dateFormat.format(e.getCreateAt());
                    if (reserveSubContent.contains("今日上午体温(℃)")) {
                        int index = conditions.indexOf(dateString + " " + "上午体温");
                        if (index == -1) {
                            conditions.append(dateString + " " + "上午体温:" + e.getAnswerContent() + "℃" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("℃", index),
                                    dateString + " " + "上午体温:" + e.getAnswerContent());
                        }
                    } else if (reserveSubContent.contains("今日下午体温(℃)")) {
                        int index = conditions.indexOf(dateString + " " + "下午体温");
                        if (index == -1) {
                            conditions.append(dateString + " " + "下午体温:" + e.getAnswerContent() + "℃" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("℃", index),
                                    dateString + " " + "下午体温:" + e.getAnswerContent());
                        }
                    } else if (reserveSubContent.contains("隔离情况")) {
                        int index = conditions.indexOf(dateString + " " + "当日隔离情况");
                        if (index == -1) {
                            conditions.append(dateString + " " + "当日隔离情况:" + e.getAnswerContent() + "\n");
                            conditions.append("————————" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("\n", index),
                                    dateString + " " + "当日隔离情况:" + e.getAnswerContent());
                        }
                    } else {
                        map.put(e.getReserveSubId() + "", e.getAnswerContent());
                    }
                });
                map.put("isolation", conditions.toString());
                resultMapList.add(map);
                nub++;
            }
        }
        resultPage.setRecords(resultMapList);
        return R.ok(resultPage);
    }
    /**
     * 居家隔离导出
     * @param detailedAdminDTO
     * @return
     */
    @Override
    public R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        HomeQuarantineRegisterExportVO exportVO = new HomeQuarantineRegisterExportVO();
        //题目
        exportVO.setSubs(retrieveQuestnaireSub(detailedAdminDTO));
        //结果数据集合
        List<List<Object>> resultList = new ArrayList<>();
        List<String> idCards = this.baseMapper.exportHomeQuarantine(detailedAdminDTO);
        if (!idCards.isEmpty()) {
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            for (String idCard : idCards) {
                //构建单个用户数据
                List<Object> userData = new ArrayList<>();
                List<HomeQuarantineRegisterStatisticsVO> statisticsList = this.baseMapper.selectStatistics(detailedAdminDTO.getReserveId(), idCard);
                HomeQuarantineRegisterStatisticsVO firstStatisticsVO = statisticsList.get(0);
                userData.add(firstStatisticsVO.getNickName());
                userData.add(DateUtils.format(firstStatisticsVO.getCreateAt(), DateUtils.ymdhms_format));
                int size = statisticsList.size();
                List<HomeQuarantineRegisterStatisticsVO> lastStatisticsVOList = statisticsList.subList(size - 13, size);
                for (HomeQuarantineRegisterStatisticsVO statisticsVO : lastStatisticsVOList) {
                    //判断当前的组件类型是否是图片上传,导出时需要导出图片
                    if (statisticsVO.getOptionType().equals(11)) {
                        try {
                            userData.add(new URL(statisticsVO.getAnswerContent()));
                        } catch (Exception e) {
                            userData.add(" ");
                            log.error("导出转换图片失败!");
                        }
                        continue;
                    }
                    //判断当前组件类型是否签名
                    if (statisticsVO.getOptionType().equals(12)) {
                        try {
                            userData.add(DatatypeConverter.parseBase64Binary(statisticsVO.getAnswerContent().substring(statisticsVO.getAnswerContent().indexOf(",") + 1)));
                        } catch (Exception e) {
                            userData.add(" ");
                            log.error("导出转换图片失败!");
                        }
                        continue;
                    }
                    userData.add(statisticsVO.getAnswerContent());
                }
                StringBuffer conditions = new StringBuffer();
                statisticsList.forEach(e -> {
                    String reserveSubContent = e.getReserveSubContent();
                    String dateString = dateFormat.format(e.getCreateAt());
                    if (reserveSubContent.contains("今日上午体温(℃)")) {
                        int index = conditions.indexOf(dateString + " " + "上午体温");
                        if (index == -1) {
                            conditions.append(dateString + " " + "上午体温:" + e.getAnswerContent() + "℃" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("℃", index),
                                    dateString + " " + "上午体温:" + e.getAnswerContent());
                        }
                    } else if (reserveSubContent.contains("今日下午体温(℃)")) {
                        int index = conditions.indexOf(dateString + " " + "下午体温");
                        if (index == -1) {
                            conditions.append(dateString + " " + "下午体温:" + e.getAnswerContent() + "℃" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("℃", index),
                                    dateString + " " + "下午体温:" + e.getAnswerContent());
                        }
                    } else if (reserveSubContent.contains("隔离情况")) {
                        int index = conditions.indexOf(dateString + " " + "当日隔离情况");
                        if (index == -1) {
                            conditions.append(dateString + " " + "当日隔离情况:" + e.getAnswerContent() + "\n");
                            conditions.append("————————" + "\n");
                        } else {
                            conditions.replace(index, conditions.indexOf("\n", index),
                                    dateString + " " + "当日隔离情况:" + e.getAnswerContent());
                        }
                    }
                });
                userData.add(conditions.toString());
                resultList.add(userData);
            }
        }
        exportVO.setDataList(resultList);
        return R.ok(exportVO);
    }
    @Override
    public R bigScreenStaticsReserve(Long communityId) {
        BigScreenStaticsReserve bigScreenStaticsReserve=comActReserveRecordMapper.biggestScreen(communityId);
        bigScreenStaticsReserve.setReservePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
        bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
            BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());
            bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
            bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
            bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
            bigScreenStaticsReserveMonth.setGasCount(bigScreenStaticsReserveMonth1.getGasCount());
            bigScreenStaticsReserveMonth.setHomeCount(bigScreenStaticsReserveMonth1.getHomeCount());
        });
        bigScreenStaticsReserve.setBigScreenStaticsReserveMonthList(bigScreenStaticsReserveMonthList);
        return R.ok(bigScreenStaticsReserve);
    }
    private List<ComActQuestnaireSubVO> retrieveQuestnaireSub(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
                .eq(ComActReserveSubDO::getReserveId, detailedAdminDTO.getReserveId()).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(5)){
                ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
                BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
                listSubVo.add(comActQuestnaireSubVO);
            }
        });
        return listSubVo;
    }
    public List<BigScreenStaticsReserveMonth> getPoints(){
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
        String nowMonth=DateUtils.getDateFormatString(new Date(),"MM");
        String nowYear=DateUtils.getDateFormatString(new Date(),"yyyy");
        String nowYearMonth=DateUtils.getDateFormatString(new Date(),"yyyyMM");
        if(Integer.parseInt(nowYearMonth)<202212){
            for(int i=9;i<=12;i++){
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        if(Integer.parseInt(nowYear)>2021){
            for(int i=1;i<=Integer.parseInt(nowMonth);i++){
                if(bigScreenStaticsReserveMonths.size()>=12){
                    bigScreenStaticsReserveMonths.remove(0);
                }
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        return bigScreenStaticsReserveMonths;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -14,6 +14,8 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexBackReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubSelectionVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;
import com.panzhihua.common.model.vos.community.reserve.*;
@@ -37,6 +39,10 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -221,6 +227,131 @@
                        }
                    }
                }
            }
        }
        return R.fail("参数错误");
    }
    @Override
    public R commitNoToken(ComActReserveCommitVO comActReserveCommitVO) {
        if(comActReserveCommitVO!=null){
            ComActReserveDO comActReserveDO=new ComActReserveDO();
            Date nowDate=DateUtil.date();
            //查询预约登记记录
            List<ComActReserveDO> list=comActReserveMapper.selectList(new QueryWrapper<ComActReserveDO>().lambda().eq(ComActReserveDO::getCommunityId,comActReserveCommitVO.getCommunityId()).eq(ComActReserveDO::getTitle,"返攀登记"));
            if(!list.isEmpty()){
                comActReserveDO=list.get(0);
            }
            comActReserveCommitVO.setId(comActReserveDO.getId());
            if(comActReserveDO!=null){
                    List<QuestnaiteSubVO> questnaiteSubVOS = JSON.parseArray(comActReserveCommitVO.getJsonObject(),QuestnaiteSubVO.class);
                    if(!questnaiteSubVOS.isEmpty()){
                        Long questId=comActReserveCommitVO.getId();
                        List<ComActReserveAnswerContentDO> answerContentList=new ArrayList<>();
                        for(QuestnaiteSubVO questnaiteSub:questnaiteSubVOS){
                            //查询用户填写题目
                            ComActReserveSubDO questnaireSubDO = comActReserveSubMapper.selectOne(new QueryWrapper<ComActReserveSubDO>().lambda()
                                    .eq(ComActReserveSubDO::getReserveId,questId).eq(ComActReserveSubDO::getKey,questnaiteSub.getKey()));
                            if(questnaireSubDO == null){
                                log.error("未查询到调查问卷题目,题目名称:" + questnaiteSub.getLabel() + "题目key:" + questnaiteSub.getKey());
                                continue;
                            }
                            Long queSubId = questnaireSubDO.getId();
                            //根据上传的类型查询不同的题目选项
                            if(questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan) || questnaiteSub.getType().equals(QuestnaiteSubVO.type.imgselect)){
                                //单选题处理
                                ComActReserveSubSelectionDO subSelectionDO = comActReserveSubSelectionMapper.selectOne(new QueryWrapper<ComActReserveSubSelectionDO>()
                                        .lambda().eq(ComActReserveSubSelectionDO::getReserveSubId,queSubId).eq(ComActReserveSubSelectionDO::getReserveId,questId)
                                        .eq(ComActReserveSubSelectionDO::getKey,questnaiteSub.getValues()));
                                if(subSelectionDO == null){
                                    log.error("未查询到调查问卷选项,题目名称:" + questnaiteSub.getLabel() + "选项key:" + questnaiteSub.getValues());
                                    continue;
                                }
                                ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO();
                                answerContentDO.setCreateAt(nowDate);
                                answerContentDO.setReserveSelectionId(subSelectionDO.getId());
                                answerContentDO.setReserveSubId(queSubId);
                                answerContentDO.setType(1);
                                answerContentDO.setChoice(subSelectionDO.getOptionName());
                                answerContentDO.setAnswerContent(subSelectionDO.getContent());
                                answerContentList.add(answerContentDO);
                            }else if(questnaiteSub.getType().equals(QuestnaiteSubVO.type.duoxuan)){
                                //多选题处理
                                String values = questnaiteSub.getValues();
                                String []value = values.split(",");
                                for (int i = 0; i < value.length; i++) {
                                    ComActReserveSubSelectionDO subSelectionDO = comActReserveSubSelectionMapper.selectOne(new QueryWrapper<ComActReserveSubSelectionDO>()
                                            .lambda().eq(ComActReserveSubSelectionDO::getReserveSubId,queSubId).eq(ComActReserveSubSelectionDO::getReserveId,questId)
                                            .eq(ComActReserveSubSelectionDO::getKey,value[i]));
                                    if(subSelectionDO == null){
                                        log.error("未查询到调查问卷选项,题目名称:" + questnaiteSub.getLabel() + "选项key:" + questnaiteSub.getValues());
                                        continue;
                                    }
                                    ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO();
                                    answerContentDO.setCreateAt(nowDate);
                                    answerContentDO.setReserveSelectionId(subSelectionDO.getId());
                                    answerContentDO.setReserveSubId(queSubId);
                                    answerContentDO.setType(1);
                                    answerContentDO.setChoice(subSelectionDO.getOptionName());
                                    answerContentDO.setAnswerContent(subSelectionDO.getContent());
                                    answerContentList.add(answerContentDO);
                                }
                            }else{
                                //文字描述不做处理
                                if(!questnaiteSub.getType().equals(QuestnaiteSubVO.type.describe)){
                                    //问答题处理
                                    String values = questnaiteSub.getValues();
                                    ComActReserveAnswerContentDO answerContentDO = new ComActReserveAnswerContentDO();
                                    answerContentDO.setCreateAt(nowDate);
                                    answerContentDO.setReserveSubId(queSubId);
                                    answerContentDO.setType(2);
                                    answerContentDO.setAnswerContent(values);
                                    answerContentList.add(answerContentDO);
                                }
                            }
                        }
                        if(!answerContentList.isEmpty()){
                            //更新回答用户数量
                            Integer joinCount = comActReserveDO.getJoinCount();
                            comActReserveDO.setJoinCount(joinCount != null ? joinCount + 1 : 1);
                            comActReserveMapper.updateById(comActReserveDO);
                            //新增用户答题记录
                            ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO();
                            userAnswerDO.setContent(comActReserveCommitVO.getContent()!=null?comActReserveCommitVO.getContent():"");
                            userAnswerDO.setName(comActReserveCommitVO.getName()!=null?comActReserveCommitVO.getName():"");
                            userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId());
                            userAnswerDO.setPhone(comActReserveCommitVO.getPhone()!=null?comActReserveCommitVO.getPhone():"");
                            userAnswerDO.setReserveId(questId);
                            userAnswerDO.setReserveTime(comActReserveCommitVO.getReserveTime()!=null?comActReserveCommitVO.getReserveTime():new Date());
                            userAnswerDO.setType(comActReserveCommitVO.getType()!=null? comActReserveCommitVO.getType() : 2);
                            userAnswerDO.setCreateAt(nowDate);
                            userAnswerDO.setJsonObject(comActReserveCommitVO.getJsonObject());
                            userAnswerDO.setStatus(ComActReserveRecordDO.status.cg);
                            comActReserveRecordService.saveOrUpdate(userAnswerDO);
                            //给答题记录赋值预约登记记录id
                            answerContentList.forEach(answerContent -> {
                                answerContent.setReserveRecordId(userAnswerDO.getId());
                            });
                            comActReserveAnswerContentService.saveBatch(answerContentList);
                            //新增用户操作记录
                            ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO();
                            comActReserveOperationRecordDO.setReserveId(comActReserveCommitVO.getId());
                            comActReserveOperationRecordDO.setReserveRecordId(userAnswerDO.getId());
                            comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br);
                            comActReserveOperationRecordDO.setCreateAt(DateUtil.date());
                            comActReserveOperationRecordDO.setReserveTime(comActReserveCommitVO.getReserveTime());
                            comActReserveOperationRecordDO.setReserveContent(COMMIT);
                            //comActReserveOperationRecordDO.setPhone(comActReserveCommitVO.getPhone());
                            comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.ytj);
                            //comActReserveOperationRecordDO.setRemark(comActReserveCommitVO.getContent());
                            comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO);
                            return R.ok("提交成功");
                        }
                    }
            }
        }
@@ -575,8 +706,8 @@
            if(isBack!=1){
                comActReserveDO.setViewNum(comActReserveDO.getViewNum()+1);
                BeanUtils.copyProperties(comActReserveDO,comActReserveDetailVO);
                List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).in("status",1,2).orderByDesc("reserve_time"));
                List<ComActReserveRecordDO> secondlist=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).orderByDesc("reserve_time"));
                List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).in("status",1,2).orderByDesc("create_at"));
                List<ComActReserveRecordDO> secondlist=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).orderByDesc("create_at"));
                //判断当前数据是否可重复提交
                if(comActReserveDO.getIsRepeat()==ComActReserveDetailVO.isOk.y||list.isEmpty()){
                    comActReserveDetailVO.setIsOk(ComActReserveDetailVO.isOk.n);
@@ -632,4 +763,50 @@
    public R reserveListApplets(Long communityId){
        return R.ok(this.baseMapper.getReserveIndexList(communityId));
    }
    @Override
    public IndexReserve indexReserve(Long communityId) {
        List<ComActReserveDO> comActReserveDOS=this.comActReserveMapper.selectList(new QueryWrapper<ComActReserveDO>().lambda().eq(ComActReserveDO::getCommunityId,communityId).orderByDesc(ComActReserveDO::getCreateAt).like(ComActReserveDO::getTitle,"返攀登记").eq(ComActReserveDO::getStatus,ComActReserveDO.status.jxz));
        if(!comActReserveDOS.isEmpty()){
            IndexBackReserve indexBackReserve=new IndexBackReserve();
            indexBackReserve.setCount(this.comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().lambda().eq(ComActReserveRecordDO::getReserveId,comActReserveDOS.get(0).getId())));
        }
        return null;
    }
    public static void getFileByBytes(byte[] bytes, String filePath, String fileName) {
        BufferedOutputStream bos = null;
        FileOutputStream fos = null;
        File file = null;
        try {
            File dir = new File(filePath);
            if (!dir.exists()) {// 判断文件目录是否存在
                dir.mkdirs();
            }
            file = new File(filePath + fileName);
            fos = new FileOutputStream(file);
            bos = new BufferedOutputStream(fos);
            bos.write(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            if (bos != null) {
                try {
                    bos.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
            if (fos != null) {
                try {
                    fos.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -30,6 +30,7 @@
    public R subjectListAdmin(Long reserveId){
        List<ComActReserveSubListVO> resultList = new ArrayList<>(100);
        resultList.add(new ComActReserveSubListVO("nub","序号"));
        resultList.add(new ComActReserveSubListVO("time","登记时间"));
        resultList.add(new ComActReserveSubListVO("nickName","用户昵称"));
        List<ComActReserveSubListVO> subList = this.baseMapper.getReserveSubjectList(reserveId);
        if(subList != null && !subList.isEmpty()){
@@ -41,7 +42,6 @@
//            resultList.addAll(list);
        }
        resultList.add(new ComActReserveSubListVO("id","登记流水"));
        resultList.add(new ComActReserveSubListVO("time","登记时间"));
        return R.ok(resultList);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -63,6 +63,7 @@
            return R.fail("社区已经存在");
        }
        BeanUtils.copyProperties(comActVO, comActDO);
        comActDO.setPlaintextPassword(password);
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
            ComActDO comActDO1 =
@@ -91,6 +92,7 @@
        if (!ObjectUtils.isEmpty(password)) {
            String encode = new BCryptPasswordEncoder().encode(password);
            comActVO.setPassword(encode);
            comActDO.setPlaintextPassword(password);
            a = 1;
        }
        ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +103,6 @@
        // a=1;
        // }
        BeanUtils.copyProperties(comActVO, comActDO);
//        ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
//        if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
//            return R.fail("该登录账号重复,请重新修改");
@@ -219,6 +220,11 @@
        return R.ok(this.comActDAO.getCommunityLists());
    }
    @Override
    public R getWestCommunityLists() {
        return R.ok(this.comActDAO.getWestCommunityLists());
    }
    /**
     * 查询社区所有列表
     * 
@@ -266,4 +272,9 @@
        return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
    }
    @Override
    public R getCommunityPassword(Long communityId){
        return R.ok(comActDAO.getCommunityPassword(communityId));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -122,6 +122,18 @@
    }
    @Override
    public R export(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
        try {
            //关键词为空时需要进行加密,通过加密去检索身份证号筛选高龄认证记录
            String idCard = AESUtil.encrypt128(pageElderAuthRecordsDTO.getSearchKey(), aesKey);
            pageElderAuthRecordsDTO.setIdCard(idCard);
        }catch (Exception e){
            log.error("查询高龄认证记录转换身份证号失败");
        }
        return R.ok(comElderAuthRecordsDAO.export(pageElderAuthRecordsDTO));
    }
    @Override
    public R detailElderAuthRecords(Long authRecordId) {
        ComElderAuthRecordVO comElderAuthRecordVO = comElderAuthRecordsDAO.detailElderAuthRecords(authRecordId);
        comElderAuthRecordVO.setNextIds(comElderAuthRecordsDAO.getNextIds(comElderAuthRecordVO.getCommunityId(),authRecordId));
@@ -593,4 +605,50 @@
    public R retrieveElderAuthDetail(Long identityAuthId) {
        return R.ok(comElderAuthRecordsDAO.findById(identityAuthId));
    }
    @Override
    public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
        if(!comElderAuthRecordVO.getIdCard().isEmpty()){
            List<ComMngPopulationDO>  comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
            if(!comMngPopulationDOS.isEmpty()){
                ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
                ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
                if(comElderAuthElderliesDO!=null){
                    Integer count=comElderAuthRecordsDAO.selectCount(new QueryWrapper<ComElderAuthRecordsDO>().lambda().eq(ComElderAuthRecordsDO::getElderliesId,comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
                    if(count==0){
                        ComElderAuthRecordsDO comElderAuthRecordsDO=new ComElderAuthRecordsDO();
                        BeanUtils.copyProperties(comElderAuthRecordVO,comElderAuthRecordsDO);
                        comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
                        comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
                        comElderAuthRecordsDO.setApprovalDate(new Date());
                        comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
                        comElderAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
                        comElderAuthRecordsDO.setApproverId(comElderAuthRecordVO.getSubmitUserId());
                        comElderAuthRecordsDO.setSubmitUserId(comElderAuthRecordVO.getSubmitUserId());
                        if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
                            return R.fail("认证失败,请重新尝试");
                        }
                        comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone());
                        comMngPopulationDAO.updateById(comMngPopulationDO);
                        comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                        comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
                        comElderAuthElderliesDO.setIdCard(null);
                        comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                        ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                        if(comPensionAuthPensionerDO!=null){
                            comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                            comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
                            comPensionAuthPensionerDO.setIdCard(null);
                            comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                        }
                        return R.ok();
                    }
                    return R.fail("当前期数已认证,请勿重复认证");
                }
                return R.fail("无养老认证数据");
            }
            return R.fail("该身份证无实有人口信息");
        }
        return R.fail("身份证不能为空");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -434,8 +434,8 @@
                // subordinateList =
                // subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
                // TreeSet<>(Comparator.comparing(o -> o.getFloor()))), ArrayList::new));
                subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getFloor))
                    .collect(Collectors.toList());
//                subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getFloor))
//                    .collect(Collectors.toList());
                subordinateList.forEach(cascade -> {
                    if (cascade.getFloor().contains("栋")) {
                        cascade.setName(cascade.getFloor());
@@ -448,8 +448,8 @@
                if (houseDO != null) {
                    subordinateList =
                        this.baseMapper.getHouseLevelByUnitNos(houseDO.getVillageId(), houseDO.getFloor());
                    subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getUnitNo))
                        .collect(Collectors.toList());
//                    subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getUnitNo))
//                        .collect(Collectors.toList());
                    // subordinateList =
                    // subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
                    // TreeSet<>(Comparator.comparing(o -> o.getUnitNo()))), ArrayList::new));
@@ -466,8 +466,8 @@
                if (houseDO != null) {
                    subordinateList = this.baseMapper.getHouseLevelByHouseNos(houseDO.getVillageId(),
                        houseDO.getFloor(), houseDO.getUnitNo());
                    subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getHouseNo))
                        .collect(Collectors.toList());
//                    subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getHouseNo))
//                        .collect(Collectors.toList());
                    // subordinateList =
                    // subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new
                    // TreeSet<>(Comparator.comparing(o -> o.getHouseNo()))), ArrayList::new));
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -9,7 +9,11 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.util.WxDataUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -62,6 +66,8 @@
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestParam;
import static java.util.Objects.nonNull;
/**
 * 实有人口Service实现类
@@ -127,8 +133,12 @@
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
    @Resource
    private ComPensionAuthStatisticsDAO comPensionAuthStatisticsDAO;
    @Resource
    private ComActReserveMapper comActReserveMapper;
    @Value("${domain.aesKey:}")
    private String aesKey;
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    /**
     * 新增实有人口
@@ -4996,6 +5006,7 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());
        populationDO.setDeath(vo.getDeath().toString());
        String cardNoAES = populationDO.getCardNo();
        try {
@@ -6572,17 +6583,19 @@
    public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
        IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
            new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
        iPage.getRecords().forEach(page -> {
            if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
                StringBuilder sb = new StringBuilder();
                sb.append(page.getAlley());
                if(!page.getHouseNum().contains("号")){
                    sb.append(page.getHouseNum() + "号");
        if(iPage!=null){
            iPage.getRecords().forEach(page -> {
                if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
                    StringBuilder sb = new StringBuilder();
                    sb.append(page.getAlley());
                    if(!page.getHouseNum().contains("号")){
                        sb.append(page.getHouseNum() + "号");
                    }
                    page.setAreaName(sb.toString());
                }
                page.setAreaName(sb.toString());
            }
        });
            });
        }
        return R.ok(iPage);
    }
@@ -6906,12 +6919,20 @@
            ageStatisticsVO5.setSum(0);
            ageStatisticsVO6.setSum(0);
        } else {
            int count=ageMap.get("age16").intValue()+ageMap.get("age27").intValue()+ageMap.get("age35").intValue()
                    +ageMap.get("age45").intValue()+ageMap.get("age55").intValue()+ageMap.get("age55over").intValue();
            ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
            ageStatisticsVO1.setPercent(BigDecimal.valueOf(ageMap.get("age16").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
            ageStatisticsVO2.setPercent(BigDecimal.valueOf(ageMap.get("age27").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
            ageStatisticsVO3.setPercent(BigDecimal.valueOf(ageMap.get("age35").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
            ageStatisticsVO4.setPercent(BigDecimal.valueOf(ageMap.get("age45").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
            ageStatisticsVO5.setPercent(BigDecimal.valueOf(ageMap.get("age55").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
            ageStatisticsVO6.setPercent(BigDecimal.valueOf(ageMap.get("age55over").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        agePopulationList.add(ageStatisticsVO1);
@@ -7040,7 +7061,7 @@
        // 查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
        // 查询特殊人群标签列表
        //查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
@@ -7124,8 +7145,49 @@
        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
//        villageStatisticsList.forEach(civilVillageStatisticsVO -> {
//            civilVillageStatisticsVO.setUserSum(comMngPopulationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getVillageId,civilVillageStatisticsVO.getVillageId())));
//            List<IndexSpecialStatisticsVO> specialStatisticsVOS = new ArrayList<>();
//            IndexSpecialStatisticsVO otherSpecial = new IndexSpecialStatisticsVO();
//            otherSpecial.setTitle("其他");
//            otherSpecial.setSum(0);
//            // 查询特殊人群标签列表
//            List<ComMngUserTagVO> userTagVOS = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
//
//            userTagVOS.forEach(comMngUserTagVO -> {
//              Integer count=comMngPopulationDAO.selectCountByVillageId(civilVillageStatisticsVO.getVillageId(),comMngUserTagVO.getTagName());
//              IndexSpecialStatisticsVO indexSpecialStatisticsVO=new IndexSpecialStatisticsVO();
//              indexSpecialStatisticsVO.setTitle(comMngUserTagVO.getTagName());
//              indexSpecialStatisticsVO.setSum(count);
//              otherSpecial.setSum(otherSpecial.getSum()+count);
//              specialStatisticsVOS.add(indexSpecialStatisticsVO);
//            });
//            otherSpecial.setSum(civilVillageStatisticsVO.getUserSum()-otherSpecial.getSum());
//            specialStatisticsVOS.add(otherSpecial);
//            civilVillageStatisticsVO.setSpecialStatisticsList(specialStatisticsVOS);
//        });
        civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
        //查询党建引领数据
        CivilPartyStatisticsVO civilParty = this.baseMapper.getCivilParty(communityId);
        if(civilParty != null){
            civilStatisticsVO.setCivilPartyStatisticsVO(civilParty);
        }
        //查询社区治理数据
        CivilGovernmentStatisticsVO civilGovernment = this.baseMapper.getCivilGovernment(communityId);
        if(civilGovernment != null){
            civilStatisticsVO.setCivilGovernmentStatisticsVO(civilGovernment);
        }
        //查询网格管理数据
        CivilGridStatisticsVO civilGrid = this.baseMapper.getCivilGrid(communityId);
        if(civilGrid != null){
            civilStatisticsVO.setCivilGridStatisticsVO(civilGrid);
        }
        //查询便民服务数据
        CivilConvenienceStatisticsVO civilConvenience = this.baseMapper.getCivilConvenience(communityId);
        if(civilConvenience != null){
            civilStatisticsVO.setCivilConvenienceStatisticsVO(civilConvenience);
        }
        return R.ok(civilStatisticsVO);
    }
@@ -7334,14 +7396,18 @@
    @Override
    public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
        EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
        if (eventDetailDTO.getType().equals(7)) {// 随手拍详情
        Integer eventType = eventDetailDTO.getEventType();
        if (eventDetailDTO.getType().equals(7) || (nonNull(eventType) && eventType.equals(2))) {// 随手拍详情
            statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
            if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
                statisticsVO.setDangerLevel("0");
                statisticsVO.setMajor(false);
                statisticsVO.setUrgent(false);
                if (statisticsVO.getEventDealStatus().equals(2)) {
                    statisticsVO.setEventDealStatus(4);
                if (statisticsVO.getEventDealStatus().equals(2)||statisticsVO.getEventDealStatus().equals(1)) {
                    statisticsVO.setEventDealStatus(1);
                }
                else {
                    statisticsVO.setEventDealStatus(2);
                }
                List<EventResourceVO> picList = new ArrayList<>();
                String[] pics = statisticsVO.getPhotoPathList().split(",");
@@ -7688,6 +7754,171 @@
            new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
    }
    @Override
    public R specialInputUserExport(PageInputUserDTO pageInputUserDTO) {
        return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
    }
    @Override
    public R westScreenStatics() {
        WestScreenStatics westScreenStatics=this.comMngPopulationDAO.westScreenStatics();
        WxDataUtil wxDataUtil=new WxDataUtil();
        westScreenStatics.setDayUser(wxDataUtil.getDayUser());
        westScreenStatics.setCountUser(wxDataUtil.getMonthUser());
        return R.ok(westScreenStatics);
    }
    @Override
    public R getComprehensivePopulationStatics(Long streetId){
        EventPopulationStatisticsVO statisticsVo = new EventPopulationStatisticsVO();
        //查询人口数据
        List<EventPopulationBasicsStatisticsVO> basicsList = comMngPopulationDAO.getBasicsList(streetId);
        if(basicsList != null){
            for (EventPopulationBasicsStatisticsVO basics : basicsList) {
                statisticsVo.setPopulationNum(statisticsVo.getPopulationNum() + basics.getPopulationNum());
                statisticsVo.setVillageNum(statisticsVo.getVillageNum() + basics.getVillageNum());
                statisticsVo.setHouseNum(statisticsVo.getHouseNum() + basics.getHouseNum());
            }
            statisticsVo.setBasicsList(basicsList);
        }
        //查询特殊人群数据
        EventPopulationSpecialStatisticsVO populationSpecial = comMngPopulationDAO.getPopulationSpecial(streetId);
        if(populationSpecial != null){
            populationSpecial.setOtherTotal(populationSpecial.getZjTotal() + populationSpecial.getSfTotal()
                    + populationSpecial.getXsTotal() + populationSpecial.getXjTotal()
                    + populationSpecial.getJzTotal() + populationSpecial.getXdTotal());
            populationSpecial.setLnTotal(comMngPopulationDAO.getPopulationAge(streetId,60));
            populationSpecial.setGlTotal(comMngPopulationDAO.getPopulationAge(streetId,80));
            statisticsVo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(statisticsVo);
    }
    @Override
    public R getComprehensiveStreetList(){
        return R.ok(comMngPopulationDAO.getComprehensiveStreetList());
    }
    @Override
    public R indexInfo(Long communityId) {
        IndexInfo indexInfo=new IndexInfo();
        //基础数据
        BaseInfo baseInfo=this.comMngPopulationDAO.baseInfo(communityId);
        indexInfo.setBaseInfo(baseInfo);
        // 查询实有人口统计模块
        IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
        // 查询实有人口性别统计
        List<IndexPopulationSexStatisticsVO> sexPopulationList =
                comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
        populationStatisticsVO.setSexPopulationList(sexPopulationList);
        // 查询实有人口年龄统计
        List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
        populationStatisticsVO.setAgePopulationList(agePopulationList);
        indexInfo.setIndexPopulationStatisticsVO(populationStatisticsVO);
        // 查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
        // 查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
        otherSpecialVO.setSum(0);
        int countAll=comMngPopulationDAO.getSpecialStatistics(communityId);
        if (!userTagList.isEmpty()) {
            userTagList.forEach(userTag -> {
                if (userTag != null) {
                    if (userTag.getSysFlag().equals(0)) {
                        Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                        IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                        otherSpecialVO.setSum(otherSpecialVO.getSum()+count);
                        specialStatisticsVO.setTitle(userTag.getTagName());
                        specialStatisticsVO.setSum(count);
                        specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
                        specialStatisticsVOList.add(specialStatisticsVO);
                    } else {
                        if (StringUtils.isNotEmpty(userTag.getTagName())) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                                otherSpecialVO.setSum(otherSpecialVO.getSum()+count);
                                specialStatisticsVO.setSum(count);
                                specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
                                specialStatisticsVOList.add(specialStatisticsVO);
                        }
                    }
                }
            });
        }
        otherSpecialVO.setSum(countAll-otherSpecialVO.getSum());
        otherSpecialVO.setPercent(BigDecimal.valueOf(otherSpecialVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
        specialStatisticsVOList.add(otherSpecialVO);
        indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
        // 查询网格化治理
        IndexEventGridStatisticsVO eventGridStatisticsVO = new IndexEventGridStatisticsVO();
        List<IndexGridStatisticsVO> gridStatisticsList = new ArrayList<>();
        // 查询网格化事件数据
        IndexGridEventStatisticsVO gridEventStatistics = comMngPopulationDAO.getGridEventStatisticsList(communityId);
        int count=gridEventStatistics.getEventGGTotal()+gridEventStatistics.getEventBWDTotal()+gridEventStatistics.getEventMDTotal()+gridEventStatistics.getEventTFTotal()+gridEventStatistics.getEventTSTotal()+gridEventStatistics.getEventZATotal();
        gridEventStatistics.setGgPercent(BigDecimal.valueOf(gridEventStatistics.getEventGGTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        gridEventStatistics.setBwdPercent(BigDecimal.valueOf(gridEventStatistics.getEventBWDTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        gridEventStatistics.setMdPercent(BigDecimal.valueOf(gridEventStatistics.getEventMDTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        gridEventStatistics.setTfPercent(BigDecimal.valueOf(gridEventStatistics.getEventTFTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        gridEventStatistics.setTsPercent(BigDecimal.valueOf(gridEventStatistics.getEventTSTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        gridEventStatistics.setZaPercent(BigDecimal.valueOf(gridEventStatistics.getEventZATotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
        // 查询网格数据
        List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
        if (!gridDataList.isEmpty()) {
            gridDataList.forEach(gridData -> {
                if (gridData != null) {
                    IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
                    gridStatisticsVO.setEventData(gridData.getGridName());
                    // 根据网格id查询网格事件列表
                    IndexGridEventStatisticsVO gridEventList =
                            comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
                    gridStatisticsVO.setGridEventStatisticsList(gridEventList);
                    gridStatisticsList.add(gridStatisticsVO);
                }
            });
        }
        eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
        indexInfo.setEventGridStatisticsVO(eventGridStatisticsVO);
        //首页业务统计
        IndexDynamic indexDynamic=this.populationDAO.indexDynamic(communityId);
        indexInfo.setIndexDynamic(indexDynamic);
        //返攀登记居家隔离数据统计
        IndexReserve indexReserve=new IndexReserve();
        IndexBackReserve indexBackReserve=new IndexBackReserve();
        indexBackReserve.setCount(comActReserveMapper.indexBackReserve(communityId));
        indexBackReserve.setIndexReserveSubList(comActReserveMapper.indexBackReserveSub(communityId));
        indexBackReserve.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(BigDecimal.valueOf(indexReserveSub.getNum()*100d/indexReserveSub.getAllCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
            }
            else {
                indexReserveSub.setPercent(BigDecimal.valueOf(0d));
            }
        });
        IndexHomeQuarantine indexHomeQuarantine=new IndexHomeQuarantine();
        indexHomeQuarantine.setCount(comActReserveMapper.indexHomeQuarantine(communityId));
        indexHomeQuarantine.setIndexReserveSubList(comActReserveMapper.IndexHomeQuarantineSub(communityId));
        indexHomeQuarantine.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(BigDecimal.valueOf(indexReserveSub.getNum()*100d/indexReserveSub.getAllCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
            }
            else {
                indexReserveSub.setPercent(BigDecimal.valueOf(0d));
            }
        });
        indexReserve.setIndexBackReserve(indexBackReserve);
        indexReserve.setIndexHomeQuarantine(indexHomeQuarantine);
        indexInfo.setIndexReserve(indexReserve);
        BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO=comActEasyPhotoDAO.selectBigscreenGridsGovern(communityId);
        indexInfo.setBigScreenGridStaticsReturn(setData(bigscreenGridsGovernanceStatisticsVO));
        return R.ok(indexInfo);
    }
    private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
@@ -7928,4 +8159,58 @@
        return ObjectUtils.isEmpty(hashMap.get(key));
    }
    private BigScreenGridStaticsReturn setData(BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO){
        List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList=new ArrayList<>();
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn.setCount(bigscreenGridsGovernanceStatisticsVO.getEventTotal()+bigscreenGridsGovernanceStatisticsVO.getOtherTotal()+bigscreenGridsGovernanceStatisticsVO.getSafety());
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn1=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn1.setTitle("突发事件报告");
        bigScreenGridStaticsReturn1.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal());
        bigScreenGridStaticsReturn1.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn1);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn2=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn2.setTitle("特殊人群服务");
        bigScreenGridStaticsReturn2.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal());
        bigScreenGridStaticsReturn2.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn2);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn3=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn3.setTitle("治安防控");
        bigScreenGridStaticsReturn3.setNum(bigscreenGridsGovernanceStatisticsVO.getEventZATotal());
        bigScreenGridStaticsReturn3.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventZATotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn3);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn4=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn4.setTitle("民生服务");
        bigScreenGridStaticsReturn4.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal());
        bigScreenGridStaticsReturn4.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn4);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn5=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn5.setTitle("矛盾劝解");
        bigScreenGridStaticsReturn5.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal());
        bigScreenGridStaticsReturn5.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn5);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn6=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn6.setTitle("防灾减灾");
        bigScreenGridStaticsReturn6.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal());
        bigScreenGridStaticsReturn6.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn6);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn7=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn7.setTitle("政策法规宣传");
        bigScreenGridStaticsReturn7.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal());
        bigScreenGridStaticsReturn7.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn7);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn8=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn8.setTitle("安全巡查");
        bigScreenGridStaticsReturn8.setNum(bigscreenGridsGovernanceStatisticsVO.getSafety());
        bigScreenGridStaticsReturn8.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getSafety()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn8);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn9=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn9.setTitle("其他");
        bigScreenGridStaticsReturn9.setNum(bigscreenGridsGovernanceStatisticsVO.getOtherTotal());
        bigScreenGridStaticsReturn9.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getOtherTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn9);
        bigScreenGridStaticsReturn.setBigScreenGridStaticsReturnList(bigScreenGridStaticsReturnList);
        return bigScreenGridStaticsReturn;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -284,6 +284,12 @@
            new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
    }
    @Override
    public R getGridVillageListApp(ComMngVillageListAppDTO villageListAppDTO) {
        return R.ok(this.baseMapper.getGridVillageList(
                new Page(villageListAppDTO.getPageNum(), villageListAppDTO.getPageSize()), villageListAppDTO));
    }
    /**
     * 综治app-根据小区id查询小区下楼栋列表
     * 
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -16,6 +16,8 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComPensionAuthPensionerService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -40,19 +42,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPensionAuthPensionerDAO;
import com.panzhihua.service_community.dao.ComPensionAuthRecordDAO;
import com.panzhihua.service_community.dao.ComPensionAuthStatisticsDAO;
import com.panzhihua.service_community.dao.SysConfMapper;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthPensionerDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthStatisticsDO;
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.ComPensionAuthRecordService;
import cn.hutool.core.util.IdcardUtil;
@@ -88,6 +77,8 @@
    private String aesKey;
    @Resource
    private ComPensionAuthPensionerService comPensionAuthPensionerService;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
    @Override
    public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -485,16 +476,15 @@
            return R.fail("信息有误,请检查!");
        }
        Date dateNow = new Date();
        String currentAuthPeriod = new SimpleDateFormat("yyyy").format(dateNow);
        List<ComPensionAuthRecordDO> currentAuthPeriodRecords = comPensionAuthRecordDAO
                .selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, comPensionAuthPensionerDO)
                        .eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            boolean alreadyAuth = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent();
            if (alreadyAuth) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
                return R.fail(String.format("该人员%s期已认证无需重复认证", addIdentityAuthDTO.getAuthPeriod()));
            }
            boolean isPendingReview = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent();
@@ -505,8 +495,8 @@
        ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO();
        BeanUtils.copyProperties(addIdentityAuthDTO, comPensionAuthRecordDO);
        comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
        comPensionAuthRecordDO.setAuthDate(dateNow);
        comPensionAuthRecordDO.setAuthPeriod(currentAuthPeriod);
        comPensionAuthRecordDO.setAuthDate(addIdentityAuthDTO.getAuthTime());
        comPensionAuthRecordDO.setAuthPeriod(addIdentityAuthDTO.getAuthPeriod());
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
            comPensionAuthRecordDO.setApprovalDate(dateNow);
@@ -541,4 +531,50 @@
    public R retrievePensionAuthDetail(Long identityAuthId) {
        return R.ok(comPensionAuthRecordDAO.findById(identityAuthId));
    }
    @Override
    public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
        if(!comElderAuthRecordVO.getIdCard().isEmpty()){
            List<ComMngPopulationDO>  comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
            if(!comMngPopulationDOS.isEmpty()){
                ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
                ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                if(comPensionAuthPensionerDO!=null){
                   Integer count=comPensionAuthRecordDAO.selectCount(new QueryWrapper<ComPensionAuthRecordDO>().lambda().eq(ComPensionAuthRecordDO::getPensionerId,comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
                   if(count==0){
                       ComPensionAuthRecordDO comPensionAuthRecordDO=new ComPensionAuthRecordDO();
                       BeanUtils.copyProperties(comElderAuthRecordVO,comPensionAuthRecordDO);
                       comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
                       comPensionAuthRecordDO.setApprovalDate(new Date());
                       comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
                       comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
                       comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
                       comPensionAuthRecordDO.setSubmitUserId(comElderAuthRecordVO.getSubmitUserId());
                       comPensionAuthRecordDO.setApproverId(comElderAuthRecordVO.getSubmitUserId());
                       if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
                           return R.fail("认证失败,请重新尝试");
                       }
                       comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone());
                       comMngPopulationDAO.updateById(comMngPopulationDO);
                       comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                       comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
                       comPensionAuthPensionerDO.setIdCard(null);
                       comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                       ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
                       if(comElderAuthElderliesDO!=null){
                           comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                           comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
                           comElderAuthElderliesDO.setIdCard(null);
                           comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                       }
                       return R.ok();
                   }
                   return R.fail("当前期数已认证,请勿重复认证");
                }
                return R.fail("无养老认证数据");
            }
            return R.fail("该身份证无实有人口信息");
        }
        return R.fail("身份证不能为空");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyPublicityServiceImpl.java
New file
@@ -0,0 +1,185 @@
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 com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.utlis.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
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.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ComPropertyPublicityDAO;
import com.panzhihua.service_community.entity.ComProperty;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.model.dos.ComPropertyPublicityDO;
import com.panzhihua.service_community.service.ComPropertyPublicityService;
import lombok.extern.slf4j.Slf4j;
/**
 * @title: ComPropertyPublicityServiceImpl
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 物业宣传服务实现类
 * @author: hans
 * @date: 2021/11/11 13:57
 */
@Service
@Slf4j
public class ComPropertyPublicityServiceImpl extends ServiceImpl<ComPropertyPublicityDAO, ComPropertyPublicityDO> implements ComPropertyPublicityService {
    @Resource
    private ComPropertyDao comPropertyDao;
    @Resource
    private ComMngStructAreaDAO comMngStructAreaDAO;
    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @Override
    public R pageComPropertyPublicity(PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        Long userId = pageComPropertyPublicityDTO.getUserId();
        ComProperty comProperty = comPropertyDao.selectOne(new QueryWrapper<ComProperty>().lambda().eq(ComProperty::getUserId, userId));
        if (nonNull(comProperty)) {
            //用户为物业
            pageComPropertyPublicityDTO.setPropertyId(comProperty.getId());
            pageComPropertyPublicityDTO.setVillageId(comProperty.getAreaId());
        } else {
            //非物业用户查看是否拥有菜单权限
            List<String> menuList = this.baseMapper.retrieveUserMenuList(userId);
            if (menuList.isEmpty() || !menuList.contains("物业宣传")) {
                return R.fail("暂无权限");
            }
        }
        Page page = new Page<>();
        page.setSize(pageComPropertyPublicityDTO.getPageSize());
        page.setCurrent(pageComPropertyPublicityDTO.getPageNum());
        return R.ok(this.baseMapper.pageComPropertyPublicity(page, pageComPropertyPublicityDTO));
    }
    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @Override
    public R addComPropertyPublicity(ComPropertyPublicityDTO comPropertyPublicityDTO) {
        Long userId = comPropertyPublicityDTO.getUserId();
        ComProperty comProperty = comPropertyDao.selectOne(new QueryWrapper<ComProperty>().lambda().eq(ComProperty::getUserId, userId));
        if (isNull(comProperty)) {
            return R.fail("暂无权限");
        }
        comPropertyPublicityDTO.setPropertyId(comProperty.getId());
        ComPropertyPublicityDO publicityDO = new ComPropertyPublicityDO();
        BeanUtils.copyProperties(comPropertyPublicityDTO, publicityDO);
        Date nowDate = new Date();
        publicityDO.setCreatedAt(nowDate);
        publicityDO.setUpdatedAt(nowDate);
        int result = this.baseMapper.insert(publicityDO);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @Override
    public R updateComPropertyPublicity(ComPropertyPublicityDTO comPropertyPublicityDTO) {
        ComPropertyPublicityDO comPropertyPublicityDO = this.baseMapper.selectById(comPropertyPublicityDTO.getId());
        if (isNull(comPropertyPublicityDO)) {
            return R.fail("信息不存在");
        }
        BeanUtils.copyProperties(comPropertyPublicityDTO, comPropertyPublicityDO);
        comPropertyPublicityDO.setUpdatedAt(new Date());
        int result = this.baseMapper.updateById(comPropertyPublicityDO);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }
    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @Override
    public R getComPropertyPublicity(Long id) {
        return R.ok(this.baseMapper.selectDetail(id));
    }
    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @Override
    public R deleteComPropertyPublicity(Long id) {
        this.baseMapper.deleteById(id);
        return R.ok();
    }
    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    @Override
    public R listProperty(Long villageId, Long communityId) {
        List<ComProperty> propertyList;
        if (nonNull(villageId)) {
            propertyList = comPropertyDao.selectList(new QueryWrapper<ComProperty>().lambda()
                    .eq(ComProperty::getCommunityId, communityId).eq(ComProperty::getAreaId, villageId));
        } else {
            propertyList = comPropertyDao.selectList(new QueryWrapper<ComProperty>().lambda().eq(ComProperty::getCommunityId, communityId));
        }
        return R.ok(propertyList);
    }
    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @Override
    public R pageComPropertyPublicityApplet(PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
        Page page = new Page<>();
        page.setSize(pageComPropertyPublicityDTO.getPageSize());
        page.setCurrent(pageComPropertyPublicityDTO.getPageNum());
        return R.ok(this.baseMapper.pageComPropertyPublicityApplet(page, pageComPropertyPublicityDTO));
    }
    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @Override
    public R incrView(Long id) {
        this.baseMapper.incrView(id);
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -56,6 +57,9 @@
    @Resource
    private UserService userService;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageDangerReport(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
@@ -229,6 +233,9 @@
            comSwDangerReportVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwDangerReportVO.getCreateBy()));
        }
        // 所属社区名称
        comSwDangerReportVO.setCommunityName(comActDAO.selectById(comSwDangerReportVO.getCommunityId()).getName());
        // 查询指派人名称
        if (StringUtils.isNotEmpty(comSwDangerReportVO.getAssignPerson())) {
            StringBuilder sb = new StringBuilder();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
import com.panzhihua.service_community.dao.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -24,10 +25,6 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
@@ -60,6 +57,9 @@
    @Resource
    private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
@@ -254,8 +254,10 @@
                .eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            if (comSwPatrolRecordVO.getIsHiddenDanger().equals(ComSwPatrolRecordVO.isOk.yes)) {
                if (null != comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
                ComSwDangerReportDO comSwDangerReportDO=comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId());
                if (null != comSwDangerReportDO) {
                    comSwPatrolRecordVO.setDisplayButton(3);
                    comSwPatrolRecordVO.setDagerNo(comSwDangerReportDO.getDangerNo());
                } else {
                    comSwPatrolRecordVO.setDisplayButton(2);
                }
@@ -304,6 +306,8 @@
        if (comSwPatrolRecordVO.getCreateBy() != null) {
            comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
        }
        // 所属社区名称
        comSwPatrolRecordVO.setCommunityName(comActDAO.selectById(comSwPatrolRecordVO.getCommunityId()).getName());
        ComSwPatrolRecordReportDO recordReportDO =
            comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda()
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -174,7 +174,7 @@
                    return R.fail("该值班表不存在");
                }
                ComSwRotaDO checkCreditCode = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda()
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
                if (null != checkCreditCode && !comSwRotaDO.getId().equals(checkCreditCode.getId())) {
                    return R.fail("该值班表已存在,值班日期重复");
                }
@@ -187,7 +187,7 @@
                comSwRotaDAO.updateById(comSwRotaDO);
            } else {
                Integer count = comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda()
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
                if (count > 0) {
                    return R.fail("该值班表已存在,值班日期重复");
                }
@@ -215,11 +215,11 @@
    }
    @Override
    public R getRotaPersonByDate(String rotaDate) {
    public R getRotaPersonByDate(String rotaDate,Long communityId) {
        ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
        try {
            comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -246,11 +246,11 @@
    }
    @Override
    public R getRotaLeaderByDate(String rotaDate) {
    public R getRotaLeaderByDate(String rotaDate,Long communityId) {
        ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
        try {
            comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -289,7 +289,8 @@
        for (ComSwRotaExcelVO comSwRotaExcelVO : list) {
            Date date = DateUtil.parse(comSwRotaExcelVO.getRotaDate(), parsePatterns);
            Integer count =
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date));
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date)
                        .eq(ComSwRotaDO::getCommunityId,communityId));
            if (count > 0) {
                return R.fail("值班日期已存在," + comSwRotaExcelVO.getRotaDate() + "重复");
            }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -196,7 +197,11 @@
        }
        // 所属社区名称
        comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName());
        ComActDO comActDO=comActDAO.selectById(comSwSafetyWorkRecordVO.getCommunityId());
        if(comActDO!=null&&StringUtils.isNotEmpty(comActDO.getName())){
            comSwSafetyWorkRecordVO.setCommunityName(comActDO.getName());
        }
        return R.ok(comSwSafetyWorkRecordVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -83,11 +83,16 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
        ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
        ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
        BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
        if(convenientMerchantDTO.getCommunityId()==0){
            convenientMerchantDO.setCommunityName("西区社区");
        }
        else {
            ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
            convenientMerchantDO.setCommunityName(comActDO.getName());
        }
        convenientMerchantDO.setUserId(0L);
        convenientMerchantDO.setCommunityName(comActDO.getName());
        convenientMerchantDO.setCreatedAt(new Date());
        int insertResult = this.baseMapper.insert(convenientMerchantDO);
        if (insertResult > 0) {
@@ -125,7 +130,12 @@
        Long communityId = convenientMerchantDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            convenientMerchantDO.setCommunityName(comActDO.getName());
            if(comActDO!=null){
                convenientMerchantDO.setCommunityName(comActDO.getName());
            }
            else {
                convenientMerchantDO.setCommunityName("西区社区");
            }
        }
        String account = convenientMerchantDTO.getAccount();
        if (isNotBlank(account)) {
@@ -279,6 +289,15 @@
        page.setSize(pagePopularMerchantDTO.getPageSize());
        page.setCurrent(pagePopularMerchantDTO.getPageNum());
        IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon);
        if(pagePopularMerchantDTO.getPageNum().equals(1L)){
            //第一页默认把犇师傅维修中心加载到第一个
            List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
            if(merchantList != null && merchantList.size() > 0){
                merchantList.addAll(merchantVOList.getRecords());
                merchantVOList.setRecords(merchantList);
            }
        }
        return R.ok(merchantVOList);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseContractConfigServiceImpl.java
New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.nonNull;
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.community.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
import com.panzhihua.service_community.dao.RentingHourseContractConfigDao;
import com.panzhihua.service_community.entity.RentingHourseContractConfig;
import com.panzhihua.service_community.service.RentingHourseContractConfigService;
import lombok.extern.slf4j.Slf4j;
/**
 * 房屋租赁-配置项表(RentingHourseContractConfig)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:46:20
 */
@Slf4j
@Service
public class RentingHourseContractConfigServiceImpl extends ServiceImpl<RentingHourseContractConfigDao, RentingHourseContractConfig> implements RentingHourseContractConfigService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @Override
    public R pageRentingHousesConfig(PageRentingHousesConfigDTO pageRentingHousesConfigDTO) {
        Page page = new Page<>();
        page.setCurrent(pageRentingHousesConfigDTO.getPageNum());
        page.setSize(pageRentingHousesConfigDTO.getPageSize());
        return R.ok(this.baseMapper.pageRentingHousesConfig(page, pageRentingHousesConfigDTO));
    }
    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @Override
    public R updateRentingHousesConfig(RentingHousesConfigDTO rentingHousesConfigDTO) {
        RentingHourseContractConfig config = this.baseMapper.selectById(rentingHousesConfigDTO.getId());
        if (nonNull(config)) {
            config.setValue(rentingHousesConfigDTO.getValue());
            this.baseMapper.updateById(config);
        }
        return R.ok();
    }
    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    @Override
    public R getRentingHouseConfig(Integer type) {
        String configKey = "";
        switch (type) {
            case 1:
                configKey = "houseRentalContract";
                break;
            case 2:
                configKey = "leaseContractModificationAgreement";
                break;
            case 3:
                configKey = "earnestDepositAgreement";
                break;
            case 4:
                configKey = "houseAgencyContract";
                break;
            case 5:
                configKey = "platformInstructions";
                break;
            case 6:
                configKey = "houseLabel";
                break;
            default:
                break;
        }
        RentingHourseContractConfig houseConfig = this.baseMapper.selectOne(new QueryWrapper<RentingHourseContractConfig>()
                .lambda().eq(RentingHourseContractConfig::getKey, configKey));
        if (nonNull(houseConfig)) {
            RentingHousesConfigVO configVO = new RentingHousesConfigVO();
            BeanUtils.copyProperties(houseConfig, configVO);
            return R.ok(configVO);
        }
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseFileServiceImpl.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHourseFile;
import com.panzhihua.service_community.dao.RentingHourseFileDao;
import com.panzhihua.service_community.service.RentingHourseFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 房屋租赁-涉及的文件表(RentingHourseFile)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:46:20
 */
@Slf4j
@Service
public class RentingHourseFileServiceImpl extends ServiceImpl<RentingHourseFileDao, RentingHourseFile> implements RentingHourseFileService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseLabelServiceImpl.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHourseLabel;
import com.panzhihua.service_community.dao.RentingHourseLabelDao;
import com.panzhihua.service_community.service.RentingHourseLabelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 房屋租赁-房源标签(RentingHourseLabel)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:46:39
 */
@Slf4j
@Service
public class RentingHourseLabelServiceImpl extends ServiceImpl<RentingHourseLabelDao, RentingHourseLabel> implements RentingHourseLabelService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
New file
@@ -0,0 +1,182 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.WxPayUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.service_community.dao.RentingHoursePayingOrderDao;
import com.panzhihua.service_community.dao.RentingHoursePreOrderDao;
import com.panzhihua.service_community.dao.RentingHourseRegisterDao;
import com.panzhihua.service_community.entity.RentingHourseOrder;
import com.panzhihua.service_community.dao.RentingHourseOrderDao;
import com.panzhihua.service_community.entity.RentingHoursePayingOrder;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import com.panzhihua.service_community.service.RentingHourseOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
 * 房屋租赁-房屋订单表(RentingHourseOrder)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:46:57
 */
@Slf4j
@Service
public class RentingHourseOrderServiceImpl extends ServiceImpl<RentingHourseOrderDao, RentingHourseOrder> implements RentingHourseOrderService {
    @Resource
    private RentingHoursePreOrderDao rentingHoursePreOrderDao;
    @Resource
    private RentingHourseOrderDao rentingHourseOrderDao;
    @Resource
    private RentingHoursePayingOrderDao rentingHoursePayingOrderDao;
    @Resource
    private RentingHourseRegisterDao rentingHourseRegisterDao;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Value("${min.app.isTest}")
    private Boolean isTest;
    @Value("${min.app.appid}")
    private String appid;
    @Value("${min.app.payKey}")
    private String payKey;
    @Value("${min.app.mchId}")
    private String mchId;
    @Value("${min.app.notifyUrl}")
    private String notifyUrl;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(rentingHourseOrderDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage));
    }
    @Override
    public R createOrder(RentingHourseOrderVO rentingHourseOrderVO) {
        RentingHourseOrder rentingHourseOrder=new RentingHourseOrder();
        BeanUtils.copyProperties(rentingHourseOrderVO,rentingHourseOrder);
        RentingHourseRegister rentingHourseRegister=rentingHourseRegisterDao.selectById(rentingHourseOrderVO.getRegisterId());
        if(rentingHourseRegister==null){
            return R.fail("未查询到该租房信息");
        }
        if(rentingHourseRegister.getStatus()!=RentingHourseRegister.Status.dcz&&rentingHourseRegister.getDetailStatus()!=3){
            return R.fail("该房屋状态不可出租");
        }
        rentingHourseOrder.setVillageId(rentingHourseRegister.getVillageId());
        rentingHourseOrder.setVillageName(rentingHourseRegister.getVillageName());
        rentingHourseOrder.setStreetId(rentingHourseRegister.getStreetId());
        rentingHourseOrder.setCreateDate(new Date());
        rentingHourseOrder.setId(Snowflake.getId());
        rentingHourseOrder.setOrderSn(DateUtils.getCurrentDateTimeStamp()+"");
        rentingHourseOrder.setStatus(RentingHourseOrder.status.wzf);
        rentingHourseOrder.setOrderType(RentingHourseOrder.orderType.pt);
        if(rentingHourseOrderDao.insert(rentingHourseOrder)>0){
            return R.ok(rentingHourseOrder.getOrderSn());
        }
        return R.fail("添加失败");
    }
    /**
     * 支付回调  判断订单类型并进行相应的逻辑处理
     * @param wxPayNotifyOrderVO
     * @return
     */
    @Override
    public R wxPayNotify(WxPayNotifyOrderVO wxPayNotifyOrderVO) {
        RentingHoursePayingOrder rentingHoursePayingOrder=new RentingHoursePayingOrder();
        BeanUtils.copyProperties(wxPayNotifyOrderVO,rentingHoursePayingOrder);
        rentingHoursePayingOrder.setId(Snowflake.getId());
        rentingHoursePayingOrderDao.insert(rentingHoursePayingOrder);
        RentingHourseOrder rentingHourseOrder=rentingHourseOrderDao.selectOne(new QueryWrapper<RentingHourseOrder>().lambda().eq(RentingHourseOrder::getOrderSn,wxPayNotifyOrderVO.getOrderSn()));
        RentingHoursePreOrder rentingHoursePreOrder=rentingHoursePreOrderDao.selectOne(new QueryWrapper<RentingHoursePreOrder>().lambda().eq(RentingHoursePreOrder::getOrderSn,wxPayNotifyOrderVO.getOrderSn()));
        if(rentingHourseOrder!=null){
            rentingHourseOrder.setStatus(RentingHourseOrder.status.yzf);
            rentingHourseOrder.setPaySn(rentingHoursePayingOrder.getId());
            rentingHourseOrderDao.updateById(rentingHourseOrder);
            RentingHourseRegister rentingHourseRegister=rentingHourseRegisterDao.selectById(rentingHourseOrder.getRegisterId());
            rentingHourseRegister.setStatus(2);
            rentingHourseRegister.setDetailStatus(4);
            rentingHourseRegisterDao.updateById(rentingHourseRegister);
            rabbitTemplate.convertAndSend("order.exchange", "order.key", rentingHourseOrder, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(DateUtil.endOfDay(DateUtil.date())) * 1000 * 3600);
                return message;
            });
        }
        if(rentingHoursePreOrder!=null){
            rentingHoursePreOrder.setStatus(RentingHoursePreOrder.status.yjl);
            rentingHoursePreOrder.setPaySn(rentingHoursePayingOrder.getId());
            rentingHoursePreOrderDao.updateById(rentingHoursePreOrder);
            RentingHourseRegister rentingHourseRegister=rentingHourseRegisterDao.selectById(rentingHourseOrder.getRegisterId());
            rentingHourseRegister.setStatus(2);
            rentingHourseRegister.setDetailStatus(4);
            rentingHourseRegisterDao.updateById(rentingHourseRegister);
            rabbitTemplate.convertAndSend("preOrder.exchange", "preOrder.key", rentingHoursePreOrder, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(rentingHoursePreOrder.getExpireDate()) * 1000 * 3600);
                return message;
            });
        }
        return R.ok();
    }
    @Override
    public R wxPay(WxPayOrderVO wxPayOrderVO) {
        RentingHourseOrder rentingHourseOrder=rentingHourseOrderDao.selectOne(new QueryWrapper<RentingHourseOrder>().lambda().eq(RentingHourseOrder::getOrderSn,wxPayOrderVO.getOrderSn()));
        RentingHoursePreOrder rentingHoursePreOrder=rentingHoursePreOrderDao.selectOne(new QueryWrapper<RentingHoursePreOrder>().lambda().eq(RentingHoursePreOrder::getOrderSn,wxPayOrderVO.getOrderSn()));
        if(rentingHourseOrder!=null){
            try {
                BigDecimal money = rentingHourseOrder.getTotalAccount();
                if (isTest) {
                    money = BigDecimal.valueOf(0.01);
                }
                // 调用wx支付
                WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "签订租房合同", wxPayOrderVO.getOpenId(),
                        wxPayOrderVO.getOrderSn(), money);
                return R.ok();
            } catch (Exception e) {
                log.error("调用微信支付异常,异常原因:" + e.getMessage());
            }
        }
        if(rentingHoursePreOrder!=null){
            try {
                BigDecimal money = rentingHoursePreOrder.getDingMoney();
                if (isTest) {
                    money = BigDecimal.valueOf(0.01);
                }
                // 调用wx支付
                WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "定金支付", wxPayOrderVO.getOpenId(),
                        wxPayOrderVO.getOrderSn(), money);
                return R.ok();
            } catch (Exception e) {
                log.error("调用微信支付异常,异常原因:" + e.getMessage());
            }
        }
        return R.fail("订单信息异常");
    }
    @Override
    public R statics(RentingHourseOrderVO rentingHourseOrderVO) {
        return R.ok(this.rentingHourseOrderDao.orderStatics(rentingHourseOrderVO));
    }
    private Long dateToSecond(Date expireTime){
        return DateUtil.between(new Date(),expireTime, DateUnit.MS);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePayingOrderServiceImpl.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHoursePayingOrder;
import com.panzhihua.service_community.dao.RentingHoursePayingOrderDao;
import com.panzhihua.service_community.service.RentingHoursePayingOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 房屋租赁-支付流水记录表(RentingHoursePayingOrder)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:47:17
 */
@Slf4j
@Service
public class RentingHoursePayingOrderServiceImpl extends ServiceImpl<RentingHoursePayingOrderDao, RentingHoursePayingOrder> implements RentingHoursePayingOrderService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePreOrderServiceImpl.java
New file
@@ -0,0 +1,69 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.RentingHourseRegisterDao;
import com.panzhihua.service_community.entity.RentingHoursePreOrder;
import com.panzhihua.service_community.dao.RentingHoursePreOrderDao;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import com.panzhihua.service_community.service.RentingHoursePreOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
/**
 * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:47:54
 */
@Slf4j
@Service
public class RentingHoursePreOrderServiceImpl extends ServiceImpl<RentingHoursePreOrderDao, RentingHoursePreOrder> implements RentingHoursePreOrderService {
    @Resource
    private RentingHoursePreOrderDao rentingHoursePreOrderDao;
    @Resource
    private RentingHourseRegisterDao rentingHourseRegisterDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.rentingHoursePreOrderDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage));
    }
    @Override
    public R createOrder(RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        RentingHourseRegister rentingHourseRegister=rentingHourseRegisterDao.selectById(rentingHoursePreOrderVO.getRegisterId());
        if(rentingHourseRegister==null){
            return R.fail("未查询到该租房信息");
        }
        if(rentingHourseRegister.getStatus()!=RentingHourseRegister.Status.dcz&&rentingHourseRegister.getDetailStatus()!=3){
            return R.fail("该房屋状态不可出租");
        }
        RentingHoursePreOrder rentingHoursePreOrder=new RentingHoursePreOrder();
        BeanUtils.copyProperties(rentingHoursePreOrderVO,rentingHoursePreOrder);
        rentingHoursePreOrder.setVillageName(rentingHourseRegister.getVillageName());
        rentingHoursePreOrder.setId(Snowflake.getId());
        rentingHoursePreOrder.setOrderSn(DateUtils.getCurrentDateTimeStamp()+"");
        rentingHoursePreOrder.setStatus(RentingHoursePreOrder.status.dzf);
        if(rentingHoursePreOrderDao.insert(rentingHoursePreOrder)>0){
            return R.ok(rentingHoursePreOrder.getOrderSn());
        }
        return R.fail("创建定金订单失败");
    }
    @Override
    public R statics(RentingHoursePreOrderVO rentingHoursePreOrderVO) {
        return R.ok(this.rentingHoursePreOrderDao.statics(rentingHoursePreOrderVO));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRefundOrderServiceImpl.java
New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.RentingHourseRefundOrder;
import com.panzhihua.service_community.dao.RentingHourseRefundOrderDao;
import com.panzhihua.service_community.service.RentingHourseRefundOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 房屋租赁-退款流水记录表(RentingHourseRefundOrder)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:48:15
 */
@Slf4j
@Service
public class RentingHourseRefundOrderServiceImpl extends ServiceImpl<RentingHourseRefundOrderDao, RentingHourseRefundOrder> implements RentingHourseRefundOrderService {
    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
New file
@@ -0,0 +1,459 @@
package com.panzhihua.service_community.service.impl;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import com.panzhihua.common.exceptions.ServiceException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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.community.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.RentingHourseContractConfigDao;
import com.panzhihua.service_community.dao.RentingHourseRegisterDao;
import com.panzhihua.service_community.entity.RentingHourseContractConfig;
import com.panzhihua.service_community.entity.RentingHourseFile;
import com.panzhihua.service_community.entity.RentingHourseRegister;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.RentingHourseFileService;
import com.panzhihua.service_community.service.RentingHourseRegisterService;
import com.panzhihua.service_community.util.NearbyUtil;
import com.panzhihua.service_community.util.WxMaConfiguration;
import com.spatial4j.core.shape.Rectangle;
import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
import cn.hutool.core.codec.Base64;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
/**
 * 房屋租售-租赁房屋登记(RentingHourseRegister)表服务实现类
 *
 * @author makejava
 * @since 2021-11-23 10:49:08
 */
@Slf4j
@Service
public class RentingHourseRegisterServiceImpl extends ServiceImpl<RentingHourseRegisterDao, RentingHourseRegister> implements RentingHourseRegisterService {
    @Resource
    private ComActVillageDAO comActVillageDAO;
    @Resource
    private RentingHourseFileService rentingHourseFileService;
    @Resource
    private RentingHourseContractConfigDao rentingHourseContractConfigDao;
    @Resource
    private WxMaConfiguration wxMaConfiguration;
    @Value("${rentinghouse.min-app.jump-page}")
    private String minAppJumpPage;
    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R registerRentingHouse(RentingHouseRegisterDTO registerDTO) {
        checkDepositMoney(registerDTO);
        Long communityId = registerDTO.getCommunityId();
        Long userId = registerDTO.getUserId();
        RentingHourseRegister houseRegister = new RentingHourseRegister();
        BeanUtils.copyProperties(registerDTO, houseRegister);
        Date nowDate = new Date();
        houseRegister.setId(Snowflake.getId());
        houseRegister.setAuthStatus(RentingHourseRegister.AuthStatus.wrz);
        houseRegister.setStatus(RentingHourseRegister.Status.dfb);
        houseRegister.setDetailStatus(RentingHourseRegister.DetailStatus.drz);
        houseRegister.setInfoStatus(2);
        houseRegister.setCreateAt(nowDate);
        houseRegister.setUpdateAt(nowDate);
        try {
            WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService().getQrcodeService();
            byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("id=" + houseRegister.getId() + "&type=6",
                    minAppJumpPage, 30, true, null, false);
            String authCode = String.format("data:image/png;base64,%s", Base64.encode(bytes));
            houseRegister.setAuthCode(authCode);
        } catch (WxErrorException e) {
            log.error("生成房源认证码失败【{}】", e.getMessage());
            return R.fail("生成房源认证码失败,请稍后重试");
        }
        //街道id
        //小区id
        List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda()
                .eq(ComMngVillageDO::getCommunityId, communityId)
                .eq(ComMngVillageDO::getAlley, registerDTO.getAlley())
                .eq(ComMngVillageDO::getHouseNum, registerDTO.getHouseNum()));
        Long streetId = 0L;
        Long villageId = 0L;
        if (!villageList.isEmpty()) {
            ComMngVillageDO village = villageList.stream().sorted(Comparator.comparing(ComMngVillageDO::getCreateAt).reversed()).findFirst().get();
            streetId = village.getStreetId();
            villageId = village.getVillageId();
            houseRegister.setStreetId(streetId);
            houseRegister.setVillageId(villageId);
        }
        //房屋编号 streetId + communityId + villageId + timestamp
        String code = "" + streetId + communityId + villageId + nowDate.toInstant().getEpochSecond();
        houseRegister.setCode(code);
        int result = this.baseMapper.insert(houseRegister);
        if (result > 0) {
            //图片存储
            Long registerId = houseRegister.getId();
            List<RentingHourseFile> files = new ArrayList<>();
            List<String> housePictures = registerDTO.getHousePictures();
            if (!housePictures.isEmpty()) {
                housePictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.fytp);
                        file.setRefId(registerId);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            List<String> propertyPictures = registerDTO.getPropertyPictures();
            if (!propertyPictures.isEmpty()) {
                propertyPictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.cqtp);
                        file.setRefId(registerId);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            List<String> credentialsPictures = registerDTO.getCredentialsPictures();
            if (!credentialsPictures.isEmpty()) {
                credentialsPictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.zjzq);
                        file.setRefId(registerId);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            rentingHourseFileService.saveBatch(files);
            return R.ok();
        }
        return R.fail("新增房源失败");
    }
    private void checkDepositMoney(RentingHouseRegisterDTO registerDTO) {
        BigDecimal dingMoney = registerDTO.getDingMoney();
        BigDecimal monthlyRentMoney = registerDTO.getMonthlyRentMoney();
        if (nonNull(dingMoney) && nonNull(monthlyRentMoney) && dingMoney.compareTo(monthlyRentMoney) == 1) {
            throw new ServiceException("500", "定金不能超过月租金");
        }
    }
    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateRentingHouse(RentingHouseRegisterDTO registerDTO) {
        checkDepositMoney(registerDTO);
        Long id = registerDTO.getId();
        Long userId = registerDTO.getUserId();
        RentingHourseRegister houseRegister = this.baseMapper.selectById(id);
        if (isNull(houseRegister)) {
            return R.fail("房源不存在");
        }
        if (houseRegister.getStatus().intValue() == RentingHourseRegister.Status.czz ||
                houseRegister.getStatus().intValue() == RentingHourseRegister.Status.ytz) {
            return R.fail("出租中、结算中不可进行编辑操作");
        }
        if (houseRegister.getStatus().intValue() == RentingHourseRegister.Status.dcz) {
            return R.fail("编辑房源请先取消发布");
        }
        Date nowDate = new Date();
        BeanUtils.copyProperties(registerDTO, houseRegister);
        houseRegister.setUpdateAt(nowDate);
        String alley = registerDTO.getAlley();
        String houseNum = registerDTO.getHouseNum();
        boolean isChange = isNotBlank(alley) && isNotBlank(houseNum)
                && (!houseRegister.getAlley().equals(alley) || !houseRegister.getHouseNum().equals(houseNum));
        if (isChange) {
            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda()
                    .eq(ComMngVillageDO::getCommunityId, registerDTO.getCommunityId())
                    .eq(ComMngVillageDO::getAlley, alley)
                    .eq(ComMngVillageDO::getHouseNum, houseNum));
            if (!villageList.isEmpty()) {
                ComMngVillageDO village = villageList.stream().sorted(Comparator.comparing(ComMngVillageDO::getCreateAt).reversed()).findFirst().get();
                houseRegister.setStreetId(village.getStreetId());
                houseRegister.setVillageId(village.getVillageId());
            }
        }
        int result = this.baseMapper.updateById(houseRegister);
        if (result > 0) {
            List<RentingHourseFile> files = new ArrayList<>();
            List<String> housePictures = registerDTO.getHousePictures();
            if (nonNull(housePictures) && !housePictures.isEmpty()) {
                rentingHourseFileService.remove(new QueryWrapper<RentingHourseFile>().lambda()
                        .eq(RentingHourseFile::getRefId, id)
                        .eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.fytp)
                        .eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
                housePictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.fytp);
                        file.setRefId(id);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            List<String> propertyPictures = registerDTO.getPropertyPictures();
            if (nonNull(propertyPictures) && !propertyPictures.isEmpty()) {
                rentingHourseFileService.remove(new QueryWrapper<RentingHourseFile>().lambda()
                        .eq(RentingHourseFile::getRefId, id)
                        .eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.cqtp)
                        .eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
                propertyPictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.cqtp);
                        file.setRefId(id);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            List<String> credentialsPictures = registerDTO.getCredentialsPictures();
            if (nonNull(credentialsPictures) && !credentialsPictures.isEmpty()) {
                rentingHourseFileService.remove(new QueryWrapper<RentingHourseFile>().lambda()
                        .eq(RentingHourseFile::getRefId, id)
                        .eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.zjzq)
                        .eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
                credentialsPictures.forEach(e -> {
                    if (StringUtils.isNotBlank(e)) {
                        RentingHourseFile file = new RentingHourseFile();
                        file.setId(Snowflake.getId());
                        file.setClassification(RentingHourseFile.Classification.zjzq);
                        file.setRefId(id);
                        file.setType(RentingHourseFile.Type.picture);
                        file.setUrl(e);
                        file.setCreateBy(userId);
                        file.setCreateAt(nowDate);
                        files.add(file);
                    }
                });
            }
            rentingHourseFileService.saveBatch(files);
            return R.ok();
        }
        return R.fail("修改失败");
    }
    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @Override
    public R pageRentingHouse(PageRentingHouseRegisterDTO pageRegisterDTO) {
        Page page = new Page<>();
        page.setCurrent(pageRegisterDTO.getPageNum());
        page.setSize(pageRegisterDTO.getPageSize());
        return R.ok(this.baseMapper.pageRentingHouse(page, pageRegisterDTO));
    }
    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @Override
    public R releaseOrCancelHouse(ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO) {
        RentingHourseRegister houseRegister = this.baseMapper.selectById(releaseOrCancelHouseDTO.getRegisterId());
        if (isNull(houseRegister)) {
            return R.fail("房源不存在");
        }
        Integer type = releaseOrCancelHouseDTO.getType();
        Integer status = houseRegister.getStatus();
        Integer authStatus = houseRegister.getAuthStatus();
        if (type.intValue() == 1) {
            //发布
            if (authStatus.intValue() == RentingHourseRegister.AuthStatus.wrz) {
                return R.fail("房源还未认证");
            }
            if (status.intValue() != RentingHourseRegister.Status.dfb) {
                return R.fail("已发布,请勿重复操作");
            }
            houseRegister.setStatus(RentingHourseRegister.Status.dcz);
            houseRegister.setDetailStatus(RentingHourseRegister.DetailStatus.dcz);
        } else {
            if (status.intValue() != RentingHourseRegister.Status.dcz) {
                return R.fail("暂不可取消发布");
            }
            //取消发布
            houseRegister.setStatus(RentingHourseRegister.Status.dfb);
            if (authStatus.intValue() == RentingHourseRegister.AuthStatus.yrz) {
                houseRegister.setDetailStatus(RentingHourseRegister.DetailStatus.dfb);
            } else {
                houseRegister.setDetailStatus(RentingHourseRegister.DetailStatus.drz);
            }
        }
        houseRegister.setUpdateAt(new Date());
        int result = this.baseMapper.updateById(houseRegister);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("失败,请重试");
    }
    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @Override
    public R deleteRentingHouse(Long registerId) {
        RentingHourseRegister houseRegister = this.baseMapper.selectById(registerId);
        if (isNull(houseRegister)) {
            return R.fail("房源不存在");
        }
        Integer status = houseRegister.getStatus();
        if (status.intValue() != RentingHourseRegister.Status.dfb) {
            return R.fail("已发布房源不支持删除");
        }
        rentingHourseFileService.remove(new QueryWrapper<RentingHourseFile>().lambda()
                .eq(RentingHourseFile::getRefId, registerId));
        int result = this.baseMapper.deleteById(registerId);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("删除失败,请重试");
    }
    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @Override
    public R getRentingHouse(Long registerId) {
        RentingHourseRegister houseRegister = this.baseMapper.selectById(registerId);
        if (isNull(houseRegister)) {
            return R.fail("房源不存在");
        }
        RentingHouseRegisterVO registerVO = new RentingHouseRegisterVO();
        BeanUtils.copyProperties(houseRegister, registerVO);
        List<RentingHourseFile> files = rentingHourseFileService.list(new QueryWrapper<RentingHourseFile>().lambda()
                .eq(RentingHourseFile::getRefId, registerId)
                .eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
        if (!files.isEmpty()) {
            Map<Integer, List<RentingHourseFile>> fileGroupMap = files.stream()
                    .collect(Collectors.groupingBy(RentingHourseFile::getClassification));
            for (Map.Entry<Integer, List<RentingHourseFile>> entry : fileGroupMap.entrySet()) {
                List<String> urls = entry.getValue().stream().map(RentingHourseFile::getUrl).collect(Collectors.toList());
                switch (entry.getKey()) {
                    case RentingHourseFile.Classification.fytp:
                        registerVO.setHousePictures(urls);
                        registerVO.setUrl(urls.get(0));
                        break;
                    case RentingHourseFile.Classification.cqtp:
                        registerVO.setPropertyPictures(urls);
                        break;
                    case RentingHourseFile.Classification.zjzq:
                        registerVO.setCredentialsPictures(urls);
                    default:
                        break;
                }
            }
        }
        RentingHourseContractConfig contractConfig = rentingHourseContractConfigDao
                .selectOne(new QueryWrapper<RentingHourseContractConfig>()
                .lambda().eq(RentingHourseContractConfig::getName, "房屋委托代理合同"));
        if (nonNull(contractConfig)) {
            registerVO.setHouseAgencyContract(contractConfig.getValue());
        }
        return R.ok(registerVO);
    }
    @Override
    public R nearby(NearbyDTO nearbyDTO) {
        Rectangle rectangle =new NearbyUtil().getRectangle(nearbyDTO.getDistance(), Double.parseDouble(nearbyDTO.getLongitude()), Double.parseDouble(nearbyDTO.getLatitude()));
        return R.ok(this.baseMapper.nearby(rectangle.getMinX(),rectangle.getMaxX(),
                rectangle.getMinY(),rectangle.getMaxY(), nearbyDTO));
    }
    @Override
    public R pageRentingHouseApplet(PageRentingHouseRegisterDTO pageRegisterDTO) {
        Page page = new Page<>();
        page.setCurrent(pageRegisterDTO.getPageNum());
        page.setSize(pageRegisterDTO.getPageSize());
        return R.ok(this.baseMapper.pageRentingHouseApplet(page, pageRegisterDTO));
    }
    @Override
    public void updateAllHouseUnionAppCode() {
        List<RentingHourseRegister> list = this.baseMapper.selectList(null);
        if (!list.isEmpty()) {
            list.stream().forEach(houseRegister -> {
                try {
                    WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService().getQrcodeService();
                    byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("id=" + houseRegister.getId() + "&type=6",
                            minAppJumpPage, 30, true, null, false);
                    String authCode = String.format("data:image/png;base64,%s", Base64.encode(bytes));
                    houseRegister.setAuthCode(authCode);
                } catch (WxErrorException e) {
                    log.error("生成房源认证码失败【{}】", e.getMessage());
                }
            });
            this.updateBatchById(list);
        }
    }
}
Diff truncated after the above file
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseReturnOrderServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/NearbyUtil.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ResultEntity.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaConfiguration.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaProperties.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxRequestEntity.java springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityCodeMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.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/ComActDynDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.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/ComActNeighborCircleDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActPictureLibrary.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseDonatesMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVillageDOMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseContractConfigMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseFileMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseLabelMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseOrderMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePayingOrderMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePreOrderMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRefundOrderMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRegisterMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseReturnOrderMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml 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/dao/ComPbDynDAO.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/service/ComBpActivityService.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.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/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/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java