springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -111,6 +111,20 @@ return communityService.detailActivity(id, userId); } @ApiOperation(value = "社区活动/志愿者活动签到") @PostMapping("activity/sign-in") public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) { comActActRegistVO.setUserId(this.getUserId()); return communityService.activitySignIn(comActActRegistVO); } @ApiOperation(value = "社区活动/志愿者活动评价") @PostMapping("activity/evaluate") public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) { comActActEvaluateVO.setUserId(this.getUserId()); return communityService.activityEvaluate(comActActEvaluateVO); } @ApiOperation(value = "报名/取消报名社区活动") @PutMapping("signactivity") public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) { springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -1,16 +1,29 @@ package com.panzhihua.applets.api; import java.util.*; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Optional; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; 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.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.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -23,9 +36,19 @@ import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; 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.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO; import com.panzhihua.common.model.vos.user.UserArchivesVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.service.user.UserService; @@ -252,6 +275,29 @@ if (!ObjectUtils.isEmpty(comActActivityVOS)) { List<ComActActivityVO> collect = comActActivityVOS.stream() .sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList()); //当前用户最近签到时间 R r2 = communityService.listSignInActivity(userId); if (R.isOk(r2) && !ObjectUtils.isEmpty(r2.getData())) { ArrayList<ComActActRegistVO> comActActRegistVOS = JSONArray.parseArray(JSONArray.toJSONString(r2.getData()), ComActActRegistVO.class).stream() .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()) .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> String.join("", f.getUserId().toString(), f.getActivityId().toString())))), ArrayList::new)); collect.forEach(comActActivityVO -> comActActRegistVOS.forEach(activitySignInVO -> { if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) { comActActivityVO.setActivitySignInDate(activitySignInVO.getCreateAt()); } })); } //当前用户活动评分 R r3 = communityService.listEvaluate(userId); if (R.isOk(r3) && !ObjectUtils.isEmpty(r3.getData())) { List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class); collect.forEach(comActActivityVO -> comActActEvaluateVOS.forEach(comActActEvaluateVO -> { if (comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())) { comActActivityVO.setMyRating(comActActEvaluateVO.getStarLevel()); } })); } return R.ok(collect); } return R.ok(comActActivityVOS); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -92,6 +92,10 @@ @ApiModelProperty("是否二维码签到 1 是 0否") private Integer isQrCode; @ApiModelProperty("用户最近签到时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date activitySignInDate; @ApiModelProperty("联系人姓名") private String contactName; @@ -122,9 +126,15 @@ @ApiModelProperty("活动评价总数") private Integer evaluateAmount; @ApiModelProperty("评分星级") @ApiModelProperty("活动评分星级平均数") private Double evaluateLevel; @ApiModelProperty("当前用户对活动的评分") private Integer myRating; @ApiModelProperty("活动是否已默认好评") private Integer isDefaultPraise; @ApiModelProperty(value = "社区id", hidden = true) private Long communityId;
@@ -26,6 +26,9 @@ @ApiModelProperty("banner图位置问卷调查列表") private List<ComActQuestnaireAppVO> bannerQuestnaireList; @ApiModelProperty("banner图位置活动列表") private List<ComActActivityVO> bannerActivityList; @ApiModelProperty("应用位置问卷调查列表") private List<ComActQuestnaireAppVO> applicationQuestnaireList;
@@ -4,19 +4,99 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; 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.RequestParam; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; 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.*; import com.panzhihua.common.model.dtos.community.bigscreen.*; import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO; 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.ComMngPopulationTagDTO; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; 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.ComSwPatrolRecordPageDTO; import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO; import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO; 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.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO; 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.PageComStreetDTO; 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.PageQuestnaireAnswerDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO; 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.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.easyPhoto.*; 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.integral.ComActIntegralCommunityRankDTO; import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO; import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO; @@ -24,18 +104,119 @@ 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.switchs.SearchCommunityDTO; import com.panzhihua.common.model.dtos.community.wallet.*; 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.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.*; import com.panzhihua.common.model.dtos.grid.admin.*; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.dtos.shop.*; 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.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.DetailNeighborAllCommentByAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; 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.user.PageInputUserDTO; 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.dtos.vaccines.VaccinesByAdminDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO; import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO; import com.panzhihua.common.model.vos.BcDictionaryItemVO; import com.panzhihua.common.model.vos.BcDictionaryVO; import com.panzhihua.common.model.vos.DictionaryVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; 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.ComActMessageBackVO; import com.panzhihua.common.model.vos.community.ComActMessageVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO; import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO; import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO; import com.panzhihua.common.model.vos.community.ComMngCarExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; import com.panzhihua.common.model.vos.community.ComStreetVO; 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.ResetComActMessageVO; import com.panzhihua.common.model.vos.community.SignactivityVO; 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; @@ -4868,4 +5049,46 @@ */ @GetMapping("/easyphoto/noHandle/list") R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId); /** * 活动签到 * * @param comActActRegistVO 请求参数 * @return 签到结果 */ @PostMapping("/activity/sign-in") R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO); /** * 用户签到列表 * * @param userId 用户id * @return 用户签到记录列表 */ @GetMapping("/sign-in/user/list") R listSignInActivity(@RequestParam("userId") Long userId); /** * 社区活动评价 * * @param comActActEvaluateVO 社区评价VO * @return 评价结果 */ @PostMapping("/activity/evaluate") R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO); /** * 用户评价列表 * * @param userId 用户id * @return 当前用户对所有活动的评价列表 */ @GetMapping("/evaluate/user/list") R listEvaluate(@RequestParam("userId") Long userId); /** * 定时任务针对活动结束后7天还未评价的用户默认好评 */ @PostMapping("/activity/default-praise") R timedTaskActivityDefaultPraise(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,6 +1,11 @@ package com.panzhihua.service_community.api; import java.util.*; 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.stream.Collectors; import javax.annotation.Resource; @@ -9,7 +14,14 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; 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.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -17,12 +29,46 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; 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.EldersAuthFeedbackAddDTO; import com.panzhihua.common.model.dtos.community.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO; 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.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; import com.panzhihua.common.model.vos.community.ComActActPrizeVO; 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.ComActMessageBackVO; import com.panzhihua.common.model.vos.community.ComActMessageVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO; import com.panzhihua.common.model.vos.community.EldersAuthVO; import com.panzhihua.common.model.vos.community.ResetComActMessageVO; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; 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; @@ -30,12 +76,41 @@ import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.*; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.common.utlis.ClazzUtils; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.IdCard; 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.ComEldersAuthHistoryRecordMapper; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.*; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; import com.panzhihua.service_community.model.dos.ComActActPrizeDO; import com.panzhihua.service_community.model.dos.ComActDynDO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; import com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO; import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO; import com.panzhihua.service_community.model.dos.ComMngStructAreaDO; import com.panzhihua.service_community.model.dos.EldersAuthDO; import com.panzhihua.service_community.service.ComActActEvaluateService; import com.panzhihua.service_community.service.ComActActPrizeService; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDynService; import com.panzhihua.service_community.service.ComActEasyPhotoActivityService; import com.panzhihua.service_community.service.ComActEasyPhotoService; import com.panzhihua.service_community.service.ComActMessageService; import com.panzhihua.service_community.service.ComActMicroWishService; import com.panzhihua.service_community.service.ComActQuestnaireService; import com.panzhihua.service_community.service.ComActService; import com.panzhihua.service_community.service.ComEldersAuthUserService; import com.panzhihua.service_community.service.ComMngStructAreaDistrictService; import com.panzhihua.service_community.service.ComMngStructAreaService; import com.panzhihua.service_community.service.ComMngStructHouseService; import com.panzhihua.service_community.service.ComMngStructOtherBuildService; import com.panzhihua.service_community.service.ComMngVolunteerMngService; import com.panzhihua.service_community.service.EldersAuthService; import cn.hutool.core.util.IdcardUtil; import lombok.extern.slf4j.Slf4j; @@ -306,7 +381,27 @@ comActActivityVO.setComActActEvaluateVOList(comActActEvaluateVOList); //活动评价总数 comActActivityVO.setEvaluateAmount(comActActEvaluateDOList.size()); //当前用户对活动的评分 Optional.ofNullable(userId).ifPresent(currentUserId -> { Optional<ComActActEvaluateDO> optional = comActActEvaluateDOList.stream() .filter(comActActEvaluateDO -> comActActEvaluateDO.getUserId().equals(currentUserId)).findFirst(); if (optional.isPresent()) { comActActivityVO.setMyRating(optional.get().getStarLevel()); } }); } //签到时间 Optional.ofNullable(userId).ifPresent(currentUserId -> { R listSignInResult = comActActivityService.listSignInActivity(currentUserId); if (R.isOk(listSignInResult) && !ObjectUtils.isEmpty(listSignInResult.getData())) { Optional<ComActActRegistVO> optional = JSONArray.parseArray(JSONArray.toJSONString(listSignInResult.getData()), ComActActRegistVO.class).stream() .filter(activitySignInVO -> activitySignInVO.getActivityId().equals(id)) .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()).findFirst(); if (optional.isPresent()) { comActActivityVO.setActivitySignInDate(optional.get().getCreateAt()); } } }); //活动报名名单 ActivitySignVO activitySignVO = new ActivitySignVO(); activitySignVO.setActivityId(id); @@ -345,6 +440,50 @@ } comActActivityVO.setIntegral(0); return R.ok(comActActivityVO); } /** * 活动签到 * * @param comActActRegistVO 请求参数 * @return 签到结果 */ @PostMapping("activity/sign-in") public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) { return comActActivityService.activitySignIn(comActActRegistVO); } /** * 用户签到列表 * * @param userId 用户id * @return 用户签到记录列表 */ @GetMapping("/sign-in/user/list") public R listSignInActivity(@RequestParam("userId") Long userId) { return comActActivityService.listSignInActivity(userId); } /** * 社区活动评价 * * @param comActActEvaluateVO 社区评价VO * @return 评价结果 */ @PostMapping("activity/evaluate") public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) { return comActActEvaluateService.activityEvaluate(comActActEvaluateVO); } /** * 用户评价列表 * * @param userId 用户id * @return 当前用户对所有活动的评价列表 */ @GetMapping("/evaluate/user/list") public R listEvaluate(@RequestParam("userId") Long userId) { return comActActEvaluateService.listEvaluate(userId); } /** @@ -2244,6 +2383,14 @@ } /** * 定时任务针对活动结束后7天还未评价的用户默认好评 */ @PostMapping("activity/default-praise") public R timedTaskActivityDefaultPraise() { return comActActEvaluateService.timedTaskActivityDefaultPraise(); } /** * 小程序-新增问卷调查浏览数量 * * @param questId springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -78,4 +78,11 @@ @Select("select openid from sys_user where user_id = #{userId}") Map<String, String> getUserOpenId(@Param("userId") Long userId); /** * 获取需要默认好评的记录 * @param activityIds 活动id list * @return 需要默认好评的记录列表 */ List<ComActActSignDO> selectNeedEvaluateSignRecords(@Param("activityIds") List<Long> activityIds); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -196,4 +196,11 @@ ActActivityListVO getScreenActActivityPeopleCount(@Param("activityId") Long activityId); ComActActivityStatisticsVO activityStatistics (@Param("activityId") Long activityId); /** * 查询置于顶部的进行中活动 * @param communityId 社区id * @return 活动列表 */ List<ComActActivityVO> getIndexTopActivityList(@Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -166,4 +166,8 @@ * 社区id */ private Long communityId; /** * 活动是否已默认好评 */ private Integer isDefaultPraise; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActEvaluateService.java
@@ -1,6 +1,8 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; /** * title: ComActActEvaluateService 社区》活动》活动评价表服务类 @@ -12,4 +14,25 @@ */ public interface ComActActEvaluateService extends IService<ComActActEvaluateDO> { /** * 社区活动评价功能 * * @param comActActEvaluateVO 社区评价VO * @return 评价结果 */ R activityEvaluate(ComActActEvaluateVO comActActEvaluateVO); /** * 定时任务针对活动结束后7天还未评价的用户默认好评 * @return 执行结果 */ R timedTaskActivityDefaultPraise(); /** * 用户评价列表 * * @param userId 用户id * @return 当前用户对所有活动的评价列表 */ R listEvaluate(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -243,4 +243,19 @@ */ R timedTaskActivityNotice(); /** * 用户签到 * * @param comActActRegistVO 签到参数 * @return 签到结果 */ R activitySignIn(ComActActRegistVO comActActRegistVO); /** *用户签到记录列表 * * @param userId 用id * @return 用户签到列表 */ R listSignInActivity(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
@@ -1,11 +1,32 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.dao.ComActActEvaluateDAO; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; import com.panzhihua.service_community.service.ComActActEvaluateService; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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.service_community.dao.ComActActEvaluateDAO; import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComActActivityDAO; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; import com.panzhihua.service_community.model.dos.ComActActSignDO; import com.panzhihua.service_community.model.dos.ComActActivityDO; import com.panzhihua.service_community.service.ComActActEvaluateService; import lombok.extern.slf4j.Slf4j; /** * title: ComActActEvaluateServiceImpl 社区》活动》活动评价表服务实现类 * projectName 成都呐喊信息技术有限公司-智慧社区项目 @@ -18,4 +39,86 @@ @Service public class ComActActEvaluateServiceImpl extends ServiceImpl<ComActActEvaluateDAO, ComActActEvaluateDO> implements ComActActEvaluateService { @Resource private ComActActivityDAO comActActivityDAO; @Resource private ComActActSignDAO comActActSignDAO; /** * 社区活动评价 * * @param comActActEvaluateVO 社区评价VO * @return 评价结果 */ @Override public R activityEvaluate(ComActActEvaluateVO comActActEvaluateVO) { ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO(); BeanUtils.copyProperties(comActActEvaluateVO, comActActEvaluateDO); int result = this.baseMapper.insert(comActActEvaluateDO); if (result < 0) { return R.fail(); } return R.ok(); } /** * 定时任务针对活动结束后7天还未评价的用户默认好评 */ @Override public R timedTaskActivityDefaultPraise() { //获取还未默认好评的活动 List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda() .eq(ComActActivityDO::getStatus, 5) .eq(ComActActivityDO::getIsDefaultPraise, 0) .le(ComActActivityDO::getEndAt, DateUtils.addDays(new Date(), 7))); //获取报名记录 if (!ObjectUtils.isEmpty(comActActivityDOS)) { List<Long> activityIds = comActActivityDOS.stream().map(ComActActivityDO::getId).collect(Collectors.toList()); List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectNeedEvaluateSignRecords(activityIds); //批量插入好评 if (!ObjectUtils.isEmpty(comActActSignDOS)) { List<ComActActEvaluateDO> comActActEvaluateDOList = comActActSignDOS.stream().map(comActActSignDO -> { ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO(); comActActEvaluateDO.setActivityId(comActActSignDO.getActivityId()); comActActEvaluateDO.setIsVolunteer(comActActSignDO.getIsVolunteer()); comActActEvaluateDO.setUserId(comActActSignDO.getUserId()); comActActEvaluateDO.setCreateAt(new Date()); comActActEvaluateDO.setStarLevel(5); return comActActEvaluateDO; }).collect(Collectors.toList()); boolean result = this.saveBatch(comActActEvaluateDOList); if (!result) { return R.fail("批量插入评价失败"); } ComActActivityDO comActActivityDO = new ComActActivityDO(); comActActivityDO.setIsDefaultPraise(1); int updateResult = comActActivityDAO.update(comActActivityDO, new UpdateWrapper<ComActActivityDO>() .lambda().in(ComActActivityDO::getId, activityIds)); if (updateResult < 0) { return R.fail("修改是否已默认评价状态失败"); } } } return R.ok(); } /** * 用户评价列表 * * @param userId 用户id * @return 当前用户对所有活动的评价列表 */ @Override public R listEvaluate(Long userId) { List<ComActActEvaluateDO> comActActEvaluateDOList = this.baseMapper.selectList(new QueryWrapper<ComActActEvaluateDO>() .lambda().eq(ComActActEvaluateDO::getUserId, userId)); ArrayList<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>(); if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) { comActActEvaluateDOList.forEach(comActActEvaluateDO -> { ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO(); BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO); comActActEvaluateVOS.add(comActActEvaluateVO); }); } return R.ok(comActActEvaluateVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -2,6 +2,7 @@ import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -12,6 +13,8 @@ import com.panzhihua.service_community.model.dos.ComActActPictureDO; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -26,11 +29,23 @@ 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.*; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; 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.screen.work.ActActivityListVO; 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.ComActActEvaluateDAO; import com.panzhihua.service_community.dao.ComActActRegistDAO; import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComActActivityDAO; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; 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.ComActActivityService; @@ -47,6 +62,8 @@ @Service public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO> implements ComActActivityService { private static final String DELIMITER = ":"; private static final String ACTIVITY_SIGN_IN = "ACTIVITY:SIGN:IN"; @Resource private ComActActivityDAO comActActivityDAO; @Resource @@ -57,6 +74,8 @@ private ComActActEvaluateDAO comActActEvaluateDAO; @Resource private ComActActRegistDAO comActActRegistDAO; @Resource private StringRedisTemplate stringRedisTemplate; @Resource private ComActActPictureDAO comActActPictureDAO; @@ -704,4 +723,49 @@ return decimalFormat.format(d1 / d2); } /** * 用户签到 * * @param comActActRegistVO 签到参数 * @return 签到结果 */ @Override public R activitySignIn(ComActActRegistVO comActActRegistVO) { Long activityId = comActActRegistVO.getActivityId(); Long userId = comActActRegistVO.getUserId(); 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(new Date()); int result = comActActRegistDAO.insert(comActActRegistDO); if (result > 0) { ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue(); opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS); } return R.ok(); } /** *用户签到记录列表 * * @param userId 用id * @return 用户签到列表 */ @Override public R listSignInActivity(Long userId) { List<ComActActRegistDO> comActActRegistDOS = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>() .lambda().eq(ComActActRegistDO::getUserId, userId)); ArrayList<ComActActRegistVO> comActActRegistVOS = new ArrayList<>(); comActActRegistDOS.forEach(comActActRegistDO -> { ComActActRegistVO comActActRegistVO = new ComActActRegistVO(); BeanUtils.copyProperties(comActActRegistDO, comActActRegistVO); comActActRegistVOS.add(comActActRegistVO); }); return R.ok(comActActRegistVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -65,6 +65,8 @@ private ComActEasyPhotoFeedbackMapper comActEasyPhotoFeedbackMapper; @Resource private ComActQuestnaireDAO comActQuestnaireDAO; @Resource private ComActActivityDAO comActActivityDAO; /** * 分页查询随手拍 @@ -664,6 +666,12 @@ easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList); } //查询社区正在进行中的banner位置的社区活动 List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId); if (!comActActivityVOList.isEmpty()) { easyPhotoRewardVO.setBannerActivityList(comActActivityVOList); } // 查询社区正在进行中的应用位置调查问卷列表 List<ComActQuestnaireAppVO> applicationQuestnaireList = comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
@@ -47,5 +47,14 @@ AND su.tags like concat('%', #{activitySignVO.tags}, '%') </if> order by caas.create_at desc <select id="selectNeedEvaluateSignRecords" resultMap="BaseResultMap"> SELECT s.id,s.activity_id,s.user_id,s.create_at,s.is_volunteer FROM `com_act_act_sign` s LEFT JOIN `com_act_act_evaluate` e ON s.activity_id=e.activity_id AND s.user_id=e.user_id WHERE s.activity_id IN <foreach collection="activityIds" item="id" index="index" open="(" close=")" separator=","> #{id} </foreach> AND e.id IS NULL </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -52,4 +52,8 @@ ,((SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) - (SELECT count(id) FROM com_act_act_evaluate WHERE activity_id = #{activityId})) as noEvaluateTotal FROM com_act_activity where id = #{activityId} </select> <select id="getIndexTopActivityList" resultMap="BaseResultMap"> SELECT * FROM `com_act_activity` WHERE community_id = #{communityId} and is_top = 1 and end_at >= now() and begin_at <= now() </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java
@@ -193,4 +193,15 @@ log.info("执行结果【{}】", r.toString()); return ReturnT.SUCCESS; } /** * 定时任务针对活动结束后7天还未评价的用户默认好评 */ @XxlJob("timedTaskActivityDefaultPraiseJobHandler") public ReturnT<String> timedTaskActivityDefaultPraiseJobHandler(String param) throws Exception { log.info("定时任务针对活动结束后7天还未评价的用户默认好评"); R r = communityService.timedTaskActivityDefaultPraise(); log.info("执行结果【{}】", r.toString()); return ReturnT.SUCCESS; } }
