diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index efa599978..1349e2251 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -11,10 +11,7 @@ import com.accompany.business.model.*; import com.accompany.business.model.guild.GuildMember; import com.accompany.business.model.relation.RelationUser; import com.accompany.business.mybatismapper.*; -import com.accompany.business.service.DauStatService; -import com.accompany.business.service.DiamondStatService; -import com.accompany.business.service.DnuStatService; -import com.accompany.business.service.WeekGuildStatService; +import com.accompany.business.service.*; import com.accompany.business.service.activity.WeekStarService; import com.accompany.business.service.apple.IOSRefundV2Service; import com.accompany.business.service.guild.*; @@ -28,8 +25,6 @@ import com.accompany.business.service.room.RoomSendRankingService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomVo; -import com.accompany.common.constant.EmailConstant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomMemberRet; import com.accompany.common.redis.RedisKey; @@ -47,7 +42,6 @@ import com.accompany.core.service.account.AccountService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.region.RegionService; import com.accompany.core.vo.UserLevelVo; -import com.accompany.email.service.EmailService; import com.accompany.payment.apple.ApplePublisher; import com.accompany.payment.iospay.JWTTranscationInfoPayload; import com.accompany.payment.model.ChargeRecord; @@ -149,17 +143,11 @@ public class MyApiService { @Autowired private WeekGuildStatMapper weekGuildStatMapper; @Autowired - private ErBanNetEaseService erBanNetEaseService; - @Autowired - private RedissonClient redissonClient; - @Autowired - private AgencyMonthSettleService agencyMonthSettleService; - @Autowired - private GuildUsdOperateService guildUsdOperateService; - @Autowired private BravoRecordService bravoRecordService; @Autowired private UserRechargeLevelService userRechargeLevelService; + @Autowired + private WeekGuildOperatorStatService weekGuildOperatorStatService; public void refreshRoomMoneyRankList() { List roomUidList = myApiAdminMapper.getExceptionRoomUid(); @@ -769,12 +757,8 @@ public class MyApiService { weekGuildStatMapper.insert(lastWeekGuildStatList); } - public void testMail() { - EmailService emailService = SpringContextHolder.getBean(EmailService.class); - - String emailAddress = "842328916@qq.com"; - Byte type = EmailConstant.EmailType.REGISTER; - emailService.sendEmailCode(emailAddress, type.intValue(), new DeviceInfo(), "127.0.0.1", null, false); + public void weekGuildOperatorStat(Integer partitionId, String date) { + weekGuildOperatorStatService.stat(partitionId, date); } public List reloadAdminMember(Boolean refreshCache, Long roomErbanNo) { @@ -808,4 +792,5 @@ public class MyApiService { }); } } + } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildOperatorAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildOperatorAdminService.java index 6a01b2817..4fd3dee8c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildOperatorAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildOperatorAdminService.java @@ -89,7 +89,9 @@ public class GuildOperatorAdminService { public Page page(BasePageParams pageParams) { Page voPage = new Page<>(pageParams.getPageNo(), pageParams.getPageSize()); Page poPage = new Page<>(pageParams.getPageNo(), pageParams.getPageSize()); - Wrapper wrapper = Wrappers.lambdaQuery().orderByDesc(GuildOperator::getId); + Wrapper wrapper = Wrappers.lambdaQuery() + .eq(null != pageParams.getPartitionId(), GuildOperator::getPartitionId, pageParams.getPartitionId()) + .orderByDesc(GuildOperator::getId); guildOperatorService.page(poPage, wrapper); if (CollectionUtils.isEmpty(poPage.getRecords())){ return voPage; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java index 80df40a20..be451a4d9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java @@ -256,6 +256,15 @@ public class MyApiController { return BusiResult.success(); } + @GetMapping("/weekGuildOperatorStat") + public BusiResult weekGuildOperatorStat(Long roomId, Integer partitionId, String date) { + if (null == roomId || !roomId.equals(603L)) { + throw new AdminServiceException(BusiStatus.PARAMERROR); + } + myApiService.weekGuildOperatorStat(partitionId, date); + return BusiResult.success(); + } + @Autowired private ActivityUserLevelExpService activityUserLevelExpService; @@ -277,18 +286,6 @@ public class MyApiController { return BusiResult.success(); } - @GetMapping("/testMail") - public BusiResult testMail(Long roomId) { - if (null == roomId){ - throw new ServiceException(BusiStatus.PARAMERROR); - } - myApiService.testMail(); - return BusiResult.success(); - } - - @Autowired - private RoomService roomService; - /** * 重刷管理员列表，获取房间管理员列表 * diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildOperatorAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildOperatorAdminController.java index 191d7a74c..61ab943e2 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildOperatorAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildOperatorAdminController.java @@ -43,6 +43,7 @@ public class GuildOperatorAdminController extends BaseController { @ApiOperation("分页查询") @ApiImplicitParams({ + @ApiImplicitParam(name = "partitionId", value = "分区"), @ApiImplicitParam(name = "pageNo", value = "页码", required = true), @ApiImplicitParam(name = "pageSize", value = "页长", required = true), }) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java index 179e4a683..2fb0f74f6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekGuildOperatorStatService.java @@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -50,17 +51,28 @@ public class WeekGuildOperatorStatService { @Autowired private RegionInfoService regionInfoService; - public void stat(List partitionEnumList) { - for (PartitionEnum partitionEnum: partitionEnumList){ + public void stat(List partitionIdList) { + for (Integer partitionId: partitionIdList){ bizExecutor.execute(() -> { - ZonedDateTime monday = DateTimeUtil.getDateTimeByZoneId(partitionEnum.getZoneId()).with(DayOfWeek.MONDAY); - String lastWeekMonday = monday.minusWeeks(1L).format(DateTimeUtil.dateFormatter); - String lastWeekSunday = monday.minusDays(1L).format(DateTimeUtil.dateFormatter); - stat(partitionEnum.getId(), partitionEnum.getZoneId(), lastWeekMonday, lastWeekSunday, true); + stat(partitionId, null); }); } } + public void stat(Integer partitionId, String mondayStr) { + PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId); + String lastWeekMonday, lastWeekSunday = null; + if (!StringUtils.hasText(mondayStr)){ + ZonedDateTime monday = DateTimeUtil.getDateTimeByZoneId(partitionEnum.getZoneId()).with(DayOfWeek.MONDAY); + lastWeekMonday = monday.minusWeeks(1L).format(DateTimeUtil.dateFormatter); + lastWeekSunday = monday.minusDays(1L).format(DateTimeUtil.dateFormatter); + } else { + lastWeekMonday = mondayStr; + lastWeekSunday = DateTimeUtil.convertDate(DateTimeUtil.addDays(DateTimeUtil.convertStrToDate(mondayStr, DateTimeUtil.DEFAULT_DATE_PATTERN), 6)); + } + stat(partitionEnum.getId(), partitionEnum.getZoneId(), lastWeekMonday, lastWeekSunday, true); + } + public void stat(Integer partitionId, String zoneId, String monday, String sunday, boolean needSaveRecord) { List guildOperatorList = guildOperatorService.listByPartitionId(partitionId); diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java index d3b82a094..da0fc5afe 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GuildOperatorWeekStatTask.java @@ -19,14 +19,14 @@ public class GuildOperatorWeekStatTask extends BaseTask { @Scheduled(cron = "5 0 0 ? * MON") public void statWeekEn() { - List partitionEnumList = List.of(PartitionEnum.ENGLISH2); - weekGuildOperatorStatService.stat(partitionEnumList); + List partitionIdList = List.of(PartitionEnum.ENGLISH2.getId()); + weekGuildOperatorStatService.stat(partitionIdList); } @Scheduled(cron = "5 0 0 ? * MON", zone = "Asia/Riyadh") public void statWeekAr() { - List partitionEnumList = List.of(PartitionEnum.ARAB, PartitionEnum.TURKEY); - weekGuildOperatorStatService.stat(partitionEnumList); + List partitionIdList = List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId()); + weekGuildOperatorStatService.stat(partitionIdList); } }