springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -171,9 +171,9 @@ String uuid=UUID.randomUUID().toString().replaceAll("-", ""); String name = uuid + "."+ extension; minioUtil.upload(file, name); Thumbnails.of(file.getInputStream()).scale(1).outputQuality(0.01).outputFormat("jpg").toFile(uuid+"compress"); File file1=new File(uuid+"compress.jpg"); String imageUrl = minioUtil.uploadFile(file1, uuid+"compress.jpg"); Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress"); File file1=new File(uuid+"_compress.jpg"); String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg"); return R.ok(imageUrl); } catch (Exception e) { log.error("上传照片失败【{}】", e.getMessage()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -19,6 +19,9 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isBlank; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 基础controller @@ -113,15 +116,14 @@ else { return "510423"; } } else { } else { LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo(); ComActVO comActVO=loginUserInfoVO.getComActVO(); if(comActVO!=null){ return comActVO.getAreaCode(); } if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){ return "510423"; } return comActVO.getAreaCode(); } }
@@ -34,146 +34,26 @@ import org.springframework.beans.BeanUtils; 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; 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.*; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO; import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO; import com.panzhihua.common.model.dtos.community.CancelRecordDTO; import com.panzhihua.common.model.dtos.community.CascadeHouseDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO; import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO; import com.panzhihua.common.model.dtos.community.ComCvtServeDTO; import com.panzhihua.common.model.dtos.community.ComExServicemanDTO; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO; 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; import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO; import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO; import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO; import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO; import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO; import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO; import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO; import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO; import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO; import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO; import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO; import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO; import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO; import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO; import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO; import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO; import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO; import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO; import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO; import com.panzhihua.common.model.dtos.community.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO; import com.panzhihua.common.model.dtos.community.OperationDetailDTO; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO; import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO; import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO; import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO; import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO; 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; import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO; import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO; import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.bigscreen.*; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.dtos.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.building.admin.*; import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto; import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO; import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO; import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO; import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO; import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO; 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.PageConvenientProductCategoryDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO; import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO; import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.cluster.admin.*; import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.*; import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO; import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO; import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO; @@ -183,50 +63,12 @@ import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO; 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.microCommercialStreet.DisableOrEnableMcsMerchantDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.*; import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO; 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.PageRentingHousesConfigDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO; import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO; import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO; import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO; import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO; import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO; import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.*; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO; import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO; import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO; import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO; import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO; import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO; import com.panzhihua.common.model.dtos.community.wallet.*; 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; @@ -234,57 +76,11 @@ import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO; import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO; import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO; import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO; import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO; import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO; import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO; import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO; import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO; import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO; import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO; import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO; import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO; import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO; import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO; import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO; import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.dtos.grid.admin.*; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO; import com.panzhihua.common.model.dtos.shop.ComShopCartDTO; import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO; import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO; import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO; import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO; import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO; import com.panzhihua.common.model.dtos.shop.OrderPayDTO; import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO; import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO; import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO; import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO; import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO; @@ -353,6 +149,9 @@ 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.dtos.vaccines.*; import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild; @@ -368,6 +167,7 @@ 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.reserve.ComActReserveDetailAdminVO; 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; @@ -1123,6 +923,7 @@ * * @param userId * 用户id * @param status * @return 活动列表 */ @PostMapping("listactivity") @@ -2252,7 +2053,7 @@ * @return 新增结果 */ @PostMapping("/addstreet") R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO); R addStreet(@RequestBody ComStreetVO comStreetVOO); /** * 删除街道 @@ -5779,6 +5580,15 @@ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO); /** * 查询预约登记题目下属选择项列表 * * @param reserveSubId * 预约登记id * @return 查询预约登记题目下属选择项列表 */ @GetMapping("/reserve/admin/subject/selection/list") List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId); /** * 查询预约登记题目列表 * @param reserveId 预约登记id * @return 约登记题目列表 @@ -6301,7 +6111,7 @@ * @return 菜单列表 */ @PostMapping("/common/data/population/second/listBack") public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO); R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO); /** * 微心愿处理人列表 @@ -8867,4 +8677,16 @@ @GetMapping("/comActRaffle/del") R deleteComActRaffle(@RequestParam("id") Long id); /** * [方法描述] 根据社区ID查询所属城市所在区区域代码， * * @param communityId * 社区ID * @return String 区域code * @author manailin * @date 2022/2/17 10:09 */ @GetMapping("act/getActBelongRegionCode") String getActBelongRegionCode(@RequestParam("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -95,7 +95,18 @@ reserveSubId = userAnswers.getReserveSubId(); try { if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){ if(userAnswers.getAnswerContent().contains("_compress")){ userData.add(new URL(userAnswers.getAnswerContent())); } else { URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"); if(url.getContent()!=null){ userData.add(url); } else { userData.add(userAnswers.getAnswerContent()); } } //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6))); } else { @@ -103,6 +114,7 @@ } }catch (Exception e){ userData.add(" "); e.printStackTrace(); log.error("导出转换图片失败！"); } continue; @@ -144,7 +156,219 @@ if(userAnswers.getOptionType().equals(11)){ reserveSubId = userAnswers.getReserveSubId(); try { if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){ if(userAnswers.getAnswerContent().contains("_compress")){ userData.add(new URL(userAnswers.getAnswerContent())); } else { URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"); if(url.getContent()!=null){ userData.add(url); } else { userData.add(userAnswers.getAnswerContent()); } } //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6))); } else { userData.add(" "); } }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(isOldDuo){ String answer = sb.toString(); userData.add(answer.substring(0, answer.length() - 1)); } resultList.add(userData); } return resultList; } public static List<List<Object>> ReserveDataNoImage(List<ComActQuestnaireAnswerContentVO> answerContentVOList) { //结果数据集合 List<List<Object>> resultList = new ArrayList<>(); //构建单个用户数据 List<Object> userData = new ArrayList<>(); String noExport = "以上信息仅用于"; //遍历答案列表 Long reserveRecordId = 0L; Long reserveSubId = 0L; Boolean isOldDuo = false; StringBuffer sb = new StringBuffer(); if (answerContentVOList != null && answerContentVOList.size() > 0) { int a=0; for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) { a++; if(answerContentVOList.size()==26&&a==9){ userData.add(" "); } //判断是文字描述直接跳过 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; } 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 { if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){ if(userAnswers.getAnswerContent().contains("_compress")){ userData.add(new URL(userAnswers.getAnswerContent())); } else { URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"); if(url.getContent()!=null){ userData.add(url); } else { userData.add(userAnswers.getAnswerContent()); } } //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6))); } else { userData.add(" "); } }catch (Exception e){ userData.add(" "); e.printStackTrace(); 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 { if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){ if(userAnswers.getAnswerContent().contains("_compress")){ userData.add(new URL(userAnswers.getAnswerContent())); } else { URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"); if(url.getContent()!=null){ userData.add(url); } else { userData.add(userAnswers.getAnswerContent()); } } //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6))); } else { userData.add(" "); } }catch (Exception e){ userData.add(" "); log.error("导出转换图片失败！"); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java
New file @@ -0,0 +1,52 @@ package com.panzhihua.common.utlis; /** * 应用模块名称 * <p> * 代码描述 * <p> * Copyright: Copyright (C) 2022 XXX, Inc. All rights reserved. * <p> * Company: 成都呐喊信息技术有限公司 * <p> * * @author manailin * @since 2022/2/17 14:33 */ import java.util.Objects; import java.util.function.BiConsumer; /** * * @author yangzhilong * @date 7/15/2019 */ public class ForEachUtils { /** * * @param <T> * @param startIndex * 开始遍历的索引 * @param elements * 集合 * @param action */ public static <T> void forEach(int startIndex, Iterable<? extends T> elements, BiConsumer<Integer, ? super T> action) { Objects.requireNonNull(elements); Objects.requireNonNull(action); if (startIndex < 0) { startIndex = 0; } int index = 0; for (T element : elements) { index++; if (index <= startIndex) { continue; } action.accept(index - 1, element); } } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java
New file @@ -0,0 +1,275 @@ package com.panzhihua.community_backstage.aop; import java.net.URL; import java.util.ArrayList; import java.util.List; import javax.xml.bind.DatatypeConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.StringUtils; import lombok.extern.slf4j.Slf4j; /** * @author lyq 前端H5组件库工具类 */ @Slf4j @Component public class RenheAssemblyUtils { @Autowired private CommunityService communityService; private static List<String> automaticDataCompletion(List<String> chooseList, String selected) { if (chooseList == null) { chooseList = new ArrayList<>(); chooseList.add("是"); chooseList.add("否"); } List<String> list = new ArrayList<>(); for (String item : chooseList) { if (item.equals(selected)) { list.add("√"); } else { list.add(""); } } return list; } /** * 数据转换--登记明细用户填写答案导出数据格式转换 * * @param answerContentVOList * 用户答题记录 * @return 用户填写答案数据 */ public 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; Boolean isOldDuo = false; StringBuffer sb = new StringBuffer(); if (answerContentVOList != null && answerContentVOList.size() > 0) { int a = 0; for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) { a++; if (answerContentVOList.size() == 26 && a == 9) { userData.add(" "); } // 判断是文字描述直接跳过 if (userAnswers.getOptionType().equals(5) || (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; } userData.add(0, " "); userData.add(1, " "); userData.add(2, " "); userData.add(28, " "); 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 { if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) { userData.add(new URL(userAnswers.getAnswerContent())); // userData.add(new // File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6))); } else { userData.add(" "); } } catch (Exception e) { e.printStackTrace(); userData.add(" "); log.error("导出转换图片失败！" + "/workspace/minio/data/files/" + userAnswers.getAnswerContent() .substring(userAnswers.getAnswerContent().indexOf("files/") + 6)); } continue; } // 如果是多选 if (userAnswers.getOptionType().equals(1)) { List<String> selectionList = communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId()); List<String> completionList = automaticDataCompletion(selectionList, userAnswers.getAnswerContent()); userData.addAll(completionList); continue; } // 如果是单选 if (userAnswers.getOptionType().equals(0)) { if (userAnswers.getAnswerContent().equals("男") || userAnswers.getAnswerContent().equals("女")) { } else { List<String> completionList = automaticDataCompletion(null, userAnswers.getAnswerContent()); userData.addAll(completionList); 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(1)) { List<String> selectionList = communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId()); List<String> completionList = automaticDataCompletion(selectionList, userAnswers.getAnswerContent()); userData.addAll(completionList); continue; } // 如果是单选 if (userAnswers.getOptionType().equals(0)) { if (userAnswers.getAnswerContent().equals("男") || userAnswers.getAnswerContent().equals("女")) { } else { List<String> completionList = automaticDataCompletion(null, userAnswers.getAnswerContent()); userData.addAll(completionList); 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 (isOldDuo) { String answer = sb.toString(); userData.add(answer.substring(0, answer.length() - 1)); } userData.add(0, " "); userData.add(1, " "); userData.add(2, " "); userData.add(28, " "); resultList.add(userData); } return resultList; } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -495,6 +495,7 @@ return R.fail(401, "请先登录"); } pagePopularMerchantDTO.setCommunityId(communityId); pagePopularMerchantDTO.setAreaCode(this.getAreaCode()); return communityService.getScreenPopularMerchants(pagePopularMerchantDTO); }
@@ -1,23 +1,24 @@ package com.panzhihua.community_backstage.api; import java.io.*; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.*; import javax.annotation.Resource; import com.lowagie.text.DocumentException; import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; import com.panzhihua.common.model.vos.community.reserve.*; import com.panzhihua.community_backstage.util.HtmlToPdfUtil; import com.panzhihua.common.utlis.StringUtils; import org.apache.poi.ss.usermodel.BorderStyle; 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 org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -31,49 +32,27 @@ 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.AddReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO; import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO; import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO; import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO; import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO; import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO; 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.model.vos.community.ComActReserveCommitVO; import com.panzhihua.common.model.vos.community.reserve.*; 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.HomeQuarantineUtil; import com.panzhihua.common.utlis.ForEachUtils; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.community_backstage.aop.RenheAssemblyUtils; 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 com.panzhihua.community_backstage.util.HtmlToPdfUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; /** * @description: 预约登记接口 @@ -87,6 +66,9 @@ public class ComActReserveApi extends BaseController { private static final String key="nahankeji1234567"; @Value("${minio.url}") private String minioUrl; @Resource private CommunityService communityService; @Resource @@ -95,6 +77,8 @@ private SFTPConfig sftpConfig; @Resource private TemplateEngine templateEngine; @Resource private RenheAssemblyUtils assemblyUtils; @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class) @PostMapping("/page") @@ -200,14 +184,16 @@ R r = communityService.makeStatisticsExportAdmin(makeStatisticsDTO); if (R.isOk(r)) { List<ComActReserveMakeRightExcelAdminVO> resultList = new ArrayList<>(); List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class); List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray .parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class); rightStatisticsList.forEach(rightStatistics -> { ComActReserveMakeRightExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeRightExcelAdminVO(); BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO); resultList.add(makeRightExcelAdminVO); }); try { SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { @@ -283,14 +269,17 @@ R r = communityService.exportMakeAdmin(pageMakeDTO); if (R.isOk(r)) { List<ComActReserveMakeDetailedExcelAdminVO> resultList = new ArrayList<>(); List<ComActReserveMakeListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class); List<ComActReserveMakeListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class); rightStatisticsList.forEach(rightStatistics -> { ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeDetailedExcelAdminVO(); ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeDetailedExcelAdminVO(); BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO); resultList.add(makeRightExcelAdminVO); }); try { SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { @@ -359,14 +348,16 @@ R r = communityService.registerStatisticsExportAdmin(registerStatisticsDTO); if (R.isOk(r)) { List<ComActReserveRegisterExcelAdminVO> resultList = new ArrayList<>(); List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class); List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class); rightStatisticsList.forEach(rightStatistics -> { ComActReserveRegisterExcelAdminVO makeRightExcelAdminVO = new ComActReserveRegisterExcelAdminVO(); BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO); resultList.add(makeRightExcelAdminVO); }); try { SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { @@ -447,7 +438,8 @@ R r = communityService.exportMakeHandleAdmin(pageMakeHandleDTO); if (R.isOk(r)) { List<ComActReserveMakeHandleExcelAdminVO> resultList = new ArrayList<>(); List<ComActReserveMakeHandleListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class); List<ComActReserveMakeHandleListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class); rightStatisticsList.forEach(rightStatistics -> { ComActReserveMakeHandleExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeHandleExcelAdminVO(); BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO); @@ -455,7 +447,8 @@ resultList.add(makeRightExcelAdminVO); }); try { SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { @@ -502,6 +495,18 @@ @ApiOperation(value = "导出登记明细") @PostMapping("/register/list/export") public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if (loginUserInfo == null) { return R.fail("请先登录"); } String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId()); if (regionCode.equals("510411")) { ComActReserveDetailAdminVO reserverRecord = communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData(); if (reserverRecord.getTitle().equals("返攀登记")) { return renheExportRegister(pageReserveRegisterDetailedAdminDTO); } } String ftpUrl = "/mnt/data/web/excel/"; String name = "登记明细导出数据.xlsx"; String noHaed = "承诺"; @@ -535,12 +540,17 @@ head1.add("登记时间"); headList.add(head1); subVOList.forEach(sub -> { if (sub.getType() != 5 && sub.getType() != 11) { if (sub.getType() != 5) { List<String> headn = new ArrayList<>(); headn.add(firstRowContent); if(!sub.getContent().equals(noHaed)){ if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){ if(sub.getType() == 11){ if(sub.getContent().contains("（")){ headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（"))); } else { headn.add(sub.getContent()); } }else{ headn.add(sub.getContent()); } @@ -608,13 +618,24 @@ } } @ApiOperation(value = "导出居家隔离统计") @PostMapping("/register/list/export/homeQuarantine") public R exportRegisterHomeQuarantineStatistics(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) { String name= "居家隔离统计表.xlsx"; @ApiOperation(value = "导出登记明细不带图片") @PostMapping("/register/list/exportNoImage") public R exportRegisterNoImage(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if (loginUserInfo == null) { return R.fail("请先登录"); } String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId()); if (regionCode.equals("510411")) { ComActReserveDetailAdminVO reserverRecord = communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData(); if (reserverRecord.getTitle().equals("返攀登记")) { return renheExportRegister(pageReserveRegisterDetailedAdminDTO); } } String ftpUrl = "/mnt/data/web/excel/"; String name = "登记明细导出数据.xlsx"; String noHaed = "承诺"; List<List<Object>> datalist = new ArrayList<>(); try { SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); @@ -629,8 +650,231 @@ * 组合导出数据 * 用户问卷答案 */ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO); QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class); List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.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) { List<String> headn = new ArrayList<>(); headn.add(firstRowContent); if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){ if(sub.getType() == 11){ if(sub.getContent().contains("（")){ headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（"))); } else { headn.add(sub.getContent()); } }else{ headn.add(sub.getContent()); } headList.add(headn); } } }); //数据转换 List<List<Object>> datalist = AssemblyUtils.ReserveDataNoImage(questnaireAnswersDTOS.getAnswers()); 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.CENTER); //设置 垂直居中 contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); contentWriteCellStyle.setWriteFont(writeFont); contentWriteCellStyle.setWrapped(true); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); excelWriter = EasyExcel.write(fileName) .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler()) .registerWriteHandler(new CustomSheetWriteHandler()).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(); } } /** * 仁和区离攀返攀特别定制excel方法。对于其他区不适用。 * * @param pageReserveRegisterDetailedAdminDTO * @return */ public R renheExportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) { String ftpUrl = "/mnt/data/web/excel/"; String name = "仁和区入攀返攀人员信息统计表模板.xlsx"; String noHaed = "承诺"; 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 { /** * 组合导出数据 用户问卷答案new FileInputStream */ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO); QuestnaireAnswersDTO questnaireAnswersDTOS = JSON .parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class); // 数据转换 List<List<Object>> datalist = assemblyUtils.ReserveData(questnaireAnswersDTOS.getAnswers()); ForEachUtils.forEach(0, datalist, (index, data) -> { data.set(0, index + 1); ForEachUtils.forEach(1, data, (indexitem, item) -> { if (indexitem == 18 && item.equals("√")) { String number = "√ /".concat(data.get(20).toString()); data.set(18, number); } }); data.remove(20); }); WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 设置头居中 headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); // 设置头字体 WriteFont headWriteFont = new WriteFont(); headWriteFont.setFontHeightInPoints((short)8); headWriteFont.setBold(true); headWriteCellStyle.setWriteFont(headWriteFont); WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); // 设置表格内容字体 WriteFont writeFont = new WriteFont(); writeFont.setFontHeightInPoints((short)11); // 设置 水平居中 contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); // 设置 垂直居中 contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); contentWriteCellStyle.setWriteFont(writeFont); // 设置边框 // 下边框 contentWriteCellStyle.setBorderBottom(BorderStyle.THIN); // 左边框 contentWriteCellStyle.setBorderLeft(BorderStyle.THIN); // 上边框 contentWriteCellStyle.setBorderTop(BorderStyle.THIN); // 右边框 contentWriteCellStyle.setBorderRight(BorderStyle.THIN); contentWriteCellStyle.setWrapped(true); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); URL url = new URL(minioUrl.replace("files/", "web/excel/仁和区入攀返攀人员信息统计表.xlsx")); // 打开连接 URLConnection con = url.openConnection(); // 输入流 InputStream is = con.getInputStream(); excelWriter = EasyExcel.write(fileName).withTemplate(is) .registerWriteHandler(horizontalCellStyleStrategy).build(); WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").build(); writeSheet.setRelativeHeadRowIndex(0); 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 = "导出居家隔离统计") @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); HomeQuarantineRegisterExportVO exportVO = JSON .parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class); List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs(); //构造表头 List<List<String>> headList = new ArrayList<List<String>>(); @@ -644,8 +888,8 @@ head1.add("登记时间"); headList.add(head1); subVOList.forEach(sub -> { if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午") && !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) { 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)){ @@ -673,7 +917,6 @@ headWriteFont.setBold(true); headWriteCellStyle.setWriteFont(headWriteFont); WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); //设置表格内容字体 WriteFont writeFont = new WriteFont(); @@ -688,10 +931,8 @@ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); excelWriter = EasyExcel.write(fileName) .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new CustemSecondhandler()) .build(); excelWriter = EasyExcel.write(fileName).registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(new CustemSecondhandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet("居家隔离统计表").head(headList).build(); excelWriter.write(datalist, writeSheet); excelWriter.finish(); @@ -749,7 +990,8 @@ String name="承诺书.pdf"; String uuid = UUID.randomUUID().toString().replace("-", ""); String ftpUrl = "/mnt/data/web/excel/"+uuid+"/"; SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort()); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl +name); if (!existDir) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -1,23 +1,21 @@ package com.panzhihua.service_community.api; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import com.panzhihua.common.model.dtos.community.CancelRecordDTO; import com.panzhihua.common.model.dtos.community.OperationDetailDTO; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper; import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO; import com.panzhihua.service_community.model.dos.ComActReserveRecordDO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO; import com.panzhihua.service_community.service.*; import com.panzhihua.common.model.dtos.community.reserve.*; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; import lombok.extern.slf4j.Slf4j; /** * 预约登记 @@ -94,7 +92,7 @@ * @return 预约登记详情 */ @GetMapping("/admin/detail") public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){ public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) { return comActReserveService.detailReserveAdmin(reserveId); } @@ -306,6 +304,17 @@ } /** * 查询预约登记题目下属选择项列表 * * @param reserveSubId * 预约登记id * @return 查询预约登记题目下属选择项列表 */ @GetMapping("/admin/subject/selection/list") public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) { return comActReserveSubService.subjectSelectionListAdmin(reserveSubId); } /** * 分页查询登记明细列表 * @param detailedAdminDTO 请求参数 * @return 登记明细列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -4,12 +4,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.*; import javax.annotation.Resource; @@ -23,14 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; 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 org.springframework.web.bind.annotation.*; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -2558,4 +2546,18 @@ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) { return comMngVolunteerMngService.importVolunteerAdmin(list,communityId,userId); } /** * [方法描述] 根据社区ID查询所属城市所在区区域代码， * * @param communityId * 社区ID * @return String 区域code * @author manailin * @date 2022/2/17 10:09 */ @GetMapping("act/getActBelongRegionCode") public String getActBelongRegionCode(@RequestParam("communityId") Long communityId) { return comActActivityService.getActBelongRegionCode(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -4,10 +4,6 @@ import java.util.List; import java.util.Map; import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO; import com.panzhihua.common.model.vos.community.ComActActivityTypeVO; 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; @@ -16,9 +12,9 @@ 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.ScreenActActivityListDTO; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.CommunityActivitiesVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO; import com.panzhihua.common.model.vos.screen.CarouselInfoVO; import com.panzhihua.service_community.model.dos.ComActActivityDO; @@ -290,4 +286,15 @@ * @return */ IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id); /** * [方法描述] 根据社区ID查询所属城市所在区区域代码， * * @param communityId * 社区ID * @return String 区域code * @author manailin * @date 2022/2/17 10:09 */ String getActBelongRegionCode(@Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java
@@ -1,13 +1,13 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO; import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO; import com.panzhihua.service_community.model.dos.ComActReserveSubDO; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO; import com.panzhihua.service_community.model.dos.ComActReserveSubDO; /** * @auther lyq @@ -25,5 +25,5 @@ List<ComActReserveSubListVO> getReserveSubjectList(@Param("reserveId") Long reserveId); List<String> subjectSelectionListAdmin(@Param("reserveSubId") Long reserveSubId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -293,4 +293,15 @@ * @return */ R addActivityType(ComActActivityTypeVO comActActivityTypeVO); /** * [方法描述] 根据社区ID查询所属城市所在区区域代码， * * @param communityId * 社区ID * @return String 区域code * @author manailin * @date 2022/2/17 10:09 */ String getActBelongRegionCode(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
@@ -1,12 +1,12 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; import com.panzhihua.common.model.dtos.community.reserve.*; 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.common.model.vos.community.reserve.ComActReserveDetailAdminVO; import com.panzhihua.service_community.model.dos.ComActReserveDO; /** @@ -76,7 +76,7 @@ * @param reserveId 预约登记id * @return 预约登记详情 */ R detailReserveAdmin(Long reserveId); R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId); /** * 社区后台-根据社区id统计预约类数据 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_community.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComActReserveSubDO; @@ -18,4 +20,12 @@ */ R subjectListAdmin(Long reserveId); /** * 查询预约登记题目下属选择项列表 * * @param reserveSubId * 预约登记id * @return 查询预约登记题目下属选择项列表 */ List<String> subjectSelectionListAdmin(Long reserveSubId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -10,19 +10,11 @@ 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; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; @@ -42,21 +34,15 @@ import com.panzhihua.common.model.vos.IndexDataVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; 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; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO; import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.entity.ComActActivityCode; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActActivityCodeService; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActIntegralUserTradeService; @@ -1089,4 +1075,9 @@ } return R.ok(); } @Override public String getActBelongRegionCode(Long communityId) { return baseMapper.getActBelongRegionCode(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -1,20 +1,33 @@ package com.panzhihua.service_community.service.impl; 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; import java.util.Date; import java.util.List; import javax.annotation.Resource; 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.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.panzhihua.common.model.dtos.community.OperationDetailDTO; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActReserveIndexVo; import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; 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; @@ -22,46 +35,15 @@ import com.panzhihua.common.model.vos.community.reserve.*; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComActReserveMapper; import com.panzhihua.service_community.dao.ComActReserveSubMapper; import com.panzhihua.service_community.model.dos.*; 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.questnaire.QuestnaiteSubVO; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActReserveAnswerContentService; import com.panzhihua.service_community.service.ComActReserveRecordService; import com.panzhihua.service_community.service.ComActReserveService; import com.panzhihua.service_community.service.ComActReserveSubSelectionService; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; 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.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Date; import java.util.List; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @auther lyq @@ -686,7 +668,7 @@ * @return 预约登记详情 */ @Override public R detailReserveAdmin(Long reserveId){ public R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId) { ComActReserveDetailAdminVO reserveDetailAdminVO = new ComActReserveDetailAdminVO(); //查询预约登记信息 ComActReserveDO reserveDO = this.baseMapper.selectById(reserveId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -1,16 +1,18 @@ package com.panzhihua.service_community.service.impl; import java.util.ArrayList; import java.util.List; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO; import com.panzhihua.service_community.dao.ComActReserveSubMapper; import com.panzhihua.service_community.model.dos.ComActReserveSubDO; import com.panzhihua.service_community.service.ComActReserveSubService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; /** * @auther lyq @@ -45,4 +47,9 @@ return R.ok(resultList); } @Override public List<String> subjectSelectionListAdmin(Long reserveSubId) { return baseMapper.subjectSelectionListAdmin(reserveSubId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -282,4 +282,8 @@ select t.* from com_act_activity t left join com_act_act_regist t1 on t.id=t1.activity_id where t1.user_id = (select t1.user_id from com_act_social_worker t LEFT JOIN sys_user t1 on t.telephone = t1.phone where t.id = #{id}) </select> <select id="getActBelongRegionCode" resultType="java.lang.String"> SELECT district_adcode FROM com_mng_struct_area_district WHERE district_adcode = ( SELECT area_code FROM com_street WHERE street_id =( SELECT street_id FROM com_act WHERE community_id = #{communityId} )) </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml
@@ -25,4 +25,8 @@ select id,content,`type` from com_act_reserve_sub where reserve_id = #{reserveId} order by id asc </select> <select id="subjectSelectionListAdmin" resultType="java.lang.String"> select content from com_act_reserve_sub_selection where reserve_sub_id = #{reserveSubId} order by id asc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -242,9 +242,8 @@ com_mng_population AS cmp LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id LEFT JOIN event_grid_data as egd on egd.grid_community_id = cmpct.community_id WHERE egd.id = #{populationListDTO.gridId} cmpct.community_id = #{populationListDTO.communityId} <if test = 'populationListDTO.keyWord != null and populationListDTO.keyWord != ""' > AND (cmp.`name` LIKE concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%')) </if> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
@@ -122,7 +122,7 @@ FROM com_convenient_merchants ccm LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id WHERE ccm.area_code=#{areaCode} and ( ccm.community_id = ${communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' WHERE ccm.area_code=#{areaCode} and ( ccm.community_id = ${communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' GROUP BY cccs.id ) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC </select> <select id="getClassifyMerchants" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> @@ -213,7 +213,7 @@ SELECT * FROM ( SELECT id, `name`, consultation_volume, view_num FROM com_convenient_merchants WHERE area_code=#{areaCode} and (community_id = ${pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100 WHERE area_code=#{pagePopularMerchantDTO.areaCode} and (community_id = ${pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100 ) temp </select> <select id="getIndexMerchantBaseData"
