diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/base/Pagination.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/base/Pagination.java index 467e68d9f..32581c438 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/base/Pagination.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/base/Pagination.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/lucky/LuckyBagFortunateRecordAdminDto.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/lucky/LuckyBagFortunateRecordAdminDto.java index ae7add3df..1ca46804d 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/lucky/LuckyBagFortunateRecordAdminDto.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/lucky/LuckyBagFortunateRecordAdminDto.java @@ -1,7 +1,6 @@ package com.accompany.admin.dto.lucky; import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModel; import lombok.Data; /** diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/boom/RoomBoomSignParams.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/boom/RoomBoomSignParams.java index 12e0138ed..3b985d220 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/boom/RoomBoomSignParams.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/boom/RoomBoomSignParams.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @Data @ApiModel public class RoomBoomSignParams extends BasePageParams { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/RoomBackgroundAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/RoomBackgroundAdminVo.java index e7d9d8887..0a8ce9a4f 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/RoomBackgroundAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/RoomBackgroundAdminVo.java @@ -1,6 +1,5 @@ package com.accompany.admin.vo; -import com.accompany.common.annotation.ReplaceAppDomain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/boom/RoomBoomSignVO.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/boom/RoomBoomSignVO.java index 0ca8f6307..26d278b27 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/boom/RoomBoomSignVO.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/boom/RoomBoomSignVO.java @@ -2,13 +2,10 @@ package com.accompany.admin.vo.boom; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @Data @ApiModel public class RoomBoomSignVO { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/chat/PublicChatTopRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/chat/PublicChatTopRecordAdminVo.java index 74dd3c06b..29502150e 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/chat/PublicChatTopRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/chat/PublicChatTopRecordAdminVo.java @@ -1,6 +1,5 @@ package com.accompany.admin.vo.chat; -import com.accompany.business.model.chat.PublicChatTopRecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/dress/UserPersonalBackgroundRecordAdminVO.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/dress/UserPersonalBackgroundRecordAdminVO.java index 236737ef9..188d7df7a 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/dress/UserPersonalBackgroundRecordAdminVO.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/dress/UserPersonalBackgroundRecordAdminVO.java @@ -1,8 +1,6 @@ package com.accompany.admin.vo.dress; -import com.accompany.business.model.dress.UserInfoCardRecord; import com.accompany.business.model.dress.UserPersonalBackgroundRecord; -import com.accompany.core.annotation.I18n; import lombok.Data; /** diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java index 0a69bf9cb..0f2e84b53 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @ApiModel @Data public class FamilyAdminVo { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberViolationRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberViolationRecordAdminVo.java index 681848346..197ba8f0f 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberViolationRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberViolationRecordAdminVo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @Data @ApiModel public class FamilyMemberViolationRecordAdminVo { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberWageStatAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberWageStatAdminVo.java index f9220ef8a..d5391dcdd 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberWageStatAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberWageStatAdminVo.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; @ApiModel @Data diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyOperateRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyOperateRecordAdminVo.java index d958aa590..1502f4477 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyOperateRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyOperateRecordAdminVo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @ApiModel @Data public class FamilyOperateRecordAdminVo { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gift/GiftPanelTabAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gift/GiftPanelTabAdminVo.java index 4407afbe9..27ab2e187 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gift/GiftPanelTabAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gift/GiftPanelTabAdminVo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Map; - @Data @ApiModel public class GiftPanelTabAdminVo { diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateRecordAdminVo.java index 1991f0153..97f30e86b 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateRecordAdminVo.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @author: liaozetao * @date: 2024/6/28 14:07 diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckybag/Lucky24PersonalStatVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckybag/Lucky24PersonalStatVo.java index 9d8a2aeed..99657f3bc 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckybag/Lucky24PersonalStatVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckybag/Lucky24PersonalStatVo.java @@ -1,7 +1,7 @@ package com.accompany.admin.vo.luckybag; -import com.accompany.sharding.vo.Lucky24PersonalStat; import com.accompany.common.result.PageResult; +import com.accompany.sharding.vo.Lucky24PersonalStat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/vip/VipSendRecordVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/vip/VipSendRecordVo.java index ed4ee0d57..7385b0546 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/vip/VipSendRecordVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/vip/VipSendRecordVo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @ApiModel @Data public class VipSendRecordVo { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/api/MyApiAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/api/MyApiAdminMapper.java index 1b29ced93..203c290a4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/api/MyApiAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/api/MyApiAdminMapper.java @@ -3,7 +3,6 @@ package com.accompany.admin.mapper.api; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *
接口描述: 深海奇缘mapper diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/chat/PublicChatTopRecordAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/chat/PublicChatTopRecordAdminMapper.java index ece2261f4..f2847e8d3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/chat/PublicChatTopRecordAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/chat/PublicChatTopRecordAdminMapper.java @@ -4,8 +4,6 @@ import com.accompany.admin.vo.chat.PublicChatTopRecordAdminVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @author: liaozetao * @date: 2024/5/8 10:45 diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/lucky/LuckyBagFortunateRecordAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/lucky/LuckyBagFortunateRecordAdminMapper.java index 111525ecb..7928a5ac4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/lucky/LuckyBagFortunateRecordAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/lucky/LuckyBagFortunateRecordAdminMapper.java @@ -2,7 +2,6 @@ package com.accompany.admin.mapper.lucky; import com.accompany.admin.dto.lucky.LuckyBagFortunateRecordAdminDto; import com.accompany.admin.vo.lucky.LuckyBagFortunateRecordAdminVo; -import com.accompany.business.model.lucky.LuckyBagFortunateRecord; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/MsgPushAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/MsgPushAdminService.java index 044d37bab..a2378aa8d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/MsgPushAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/MsgPushAdminService.java @@ -10,7 +10,6 @@ import com.accompany.business.service.MsgPushService; import com.accompany.business.service.user.UsersService; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; - import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.Users; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RegionInfoAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RegionInfoAdminService.java index 88b75ba7d..728fee113 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RegionInfoAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RegionInfoAdminService.java @@ -1,6 +1,5 @@ package com.accompany.admin.service; -import com.accompany.core.model.RegionInfo; import com.accompany.core.service.region.RegionInfoService; import com.accompany.core.vo.RegionInfoVo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RobotAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RobotAdminService.java index c5d6c818b..a77aa0cb0 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RobotAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RobotAdminService.java @@ -2,11 +2,11 @@ package com.accompany.admin.service; import com.accompany.admin.mapper.RobotAdminMapper; import com.accompany.business.model.room.RobotUsing; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.RobotV2Service; import com.accompany.business.service.room.RobotUsingService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.util.NetEaseConstant; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.Room; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java index c356e937b..702c3865e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java @@ -10,14 +10,14 @@ import com.accompany.business.mybatismapper.PrivatePhotoMapper; import com.accompany.business.mybatismapper.UserInviteCodeMapper; import com.accompany.business.service.AccountLoginRecordService; import com.accompany.business.service.family.FamilyClanService; -import com.accompany.business.vo.family.FamilyClanDecorateVo; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.user.PrivatePhotoService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.InviteCodeUtil; import com.accompany.business.vo.UserPurseVo; +import com.accompany.business.vo.family.FamilyClanDecorateVo; import com.accompany.common.constant.ApplicationConstant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.BaseNetEaseRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; @@ -47,8 +47,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; @Service public class UserCheckAdminService { 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 04ccf53e9..5a92649f2 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 @@ -1,7 +1,6 @@ package com.accompany.admin.service.api; import com.accompany.admin.mapper.GiftSendRecordBatchMapper; -import com.accompany.business.mybatismapper.Lucky24RecordBatchMapper; import com.accompany.admin.mapper.api.MyApiAdminMapper; import com.accompany.admin.model.MainlandAccount; import com.accompany.admin.model.UserLevelExperienceExport; @@ -11,6 +10,7 @@ import com.accompany.business.model.LevelCharm; import com.accompany.business.model.LevelExperience; import com.accompany.business.model.UserLevelCharm; import com.accompany.business.model.UserLevelExperience; +import com.accompany.business.mybatismapper.Lucky24RecordBatchMapper; import com.accompany.business.service.apple.IOSRefundV2Service; import com.accompany.business.service.gift.GiftSendRecordService; import com.accompany.business.service.level.LevelService; @@ -60,7 +60,9 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; @Slf4j diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/chat/PublicChatTopRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/chat/PublicChatTopRecordAdminService.java index 452ae655d..6cd137395 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/chat/PublicChatTopRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/chat/PublicChatTopRecordAdminService.java @@ -3,8 +3,6 @@ package com.accompany.admin.service.chat; import com.accompany.admin.vo.chat.PublicChatTopRecordAdminVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.List; - /** * @author: liaozetao * @date: 2024/5/8 10:43 diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyIncomeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyIncomeAdminService.java index cdd4f9d64..a4d17df82 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyIncomeAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyIncomeAdminService.java @@ -2,8 +2,12 @@ package com.accompany.admin.service.family; import com.accompany.admin.vo.family.FamilyIncomeAdminVo; import com.accompany.admin.vo.family.FamilyMemberIncomeAdminVo; -import com.accompany.business.model.family.*; -import com.accompany.business.service.family.*; +import com.accompany.business.model.family.Family; +import com.accompany.business.model.family.FamilyGiftRecord; +import com.accompany.business.model.family.FamilyMember; +import com.accompany.business.service.family.FamilyGiftRecordService; +import com.accompany.business.service.family.FamilyMemberService; +import com.accompany.business.service.family.FamilyService; import com.accompany.business.service.room.FamilyMemberRoomMicRecordService; import com.accompany.business.service.user.UsersService; import com.accompany.common.status.BusiStatus; @@ -13,8 +17,6 @@ import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.sharding.model.FamilyMemberRoomMicRecord; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java index c094f1f62..dfbcc2674 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java @@ -12,7 +12,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyMemberViolationAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyMemberViolationAdminService.java index 18ba4a117..1a8c7bc41 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyMemberViolationAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyMemberViolationAdminService.java @@ -4,8 +4,14 @@ package com.accompany.admin.service.family; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.vo.family.FamilyMemberViolationRecordAdminVo; -import com.accompany.business.model.family.*; -import com.accompany.business.service.family.*; +import com.accompany.business.model.family.Family; +import com.accompany.business.model.family.FamilyMember; +import com.accompany.business.model.family.FamilyMemberViolation; +import com.accompany.business.model.family.FamilyMemberViolationRecord; +import com.accompany.business.service.family.FamilyMemberService; +import com.accompany.business.service.family.FamilyMemberViolationRecordService; +import com.accompany.business.service.family.FamilyMemberViolationService; +import com.accompany.business.service.family.FamilyService; import com.accompany.business.service.user.UsersService; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyWageStatAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyWageStatAdminService.java index 75953acca..b9d55e8ad 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyWageStatAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyWageStatAdminService.java @@ -5,7 +5,10 @@ import com.accompany.admin.vo.family.FamilyMemberWageStatAdminVo; import com.accompany.admin.vo.family.FamilyWageStatAdminVo; import com.accompany.business.constant.family.FamilyConstant; import com.accompany.business.model.UserPurse; -import com.accompany.business.model.family.*; +import com.accompany.business.model.family.Family; +import com.accompany.business.model.family.FamilyGiftRecord; +import com.accompany.business.model.family.FamilyMember; +import com.accompany.business.model.family.FamilyMemberGoldRemainDayRecord; import com.accompany.business.service.family.*; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.room.FamilyMemberRoomMicRecordService; @@ -24,8 +27,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/floating/impl/FloatingScreenAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/floating/impl/FloatingScreenAdminServiceImpl.java index e89dcba2d..91e2057fd 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/floating/impl/FloatingScreenAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/floating/impl/FloatingScreenAdminServiceImpl.java @@ -4,13 +4,13 @@ import com.accompany.admin.dto.floating.FloatingScreenMessageAdminDto; import com.accompany.admin.mapper.FloatingScreenRecordMapper; import com.accompany.admin.model.FloatingScreenRecord; import com.accompany.admin.service.floating.FloatingScreenAdminService; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; import com.accompany.core.model.Users; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java index 7a08b44bc..f9211d1e7 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java @@ -10,9 +10,9 @@ import com.accompany.business.model.*; import com.accompany.business.mybatismapper.GiftMapper; import com.accompany.business.mybatismapper.RoomExclusiveGiftMapper; import com.accompany.business.mybatismapper.UserPurseMapperExpand; +import com.accompany.business.service.gift.GiftSendRecordService; import com.accompany.business.service.prize.PrizeContext; import com.accompany.business.service.prize.PrizeStrategyFactory; -import com.accompany.business.service.gift.GiftSendRecordService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.room.RoomFreeGiftService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftSendRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftSendRecordAdminService.java index bba02d853..a4a7ebb34 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftSendRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftSendRecordAdminService.java @@ -1,8 +1,5 @@ package com.accompany.admin.service.gift; -import com.accompany.admin.base.Pagination; -import com.accompany.admin.mapper.GiftSendRecordAdminMapper; -import com.accompany.admin.mapper.LuckyBagAdminMapper; import com.accompany.admin.vo.GiftSendRecordAdminVo; import com.accompany.business.model.Gift; import com.accompany.business.service.gift.GiftService; @@ -14,9 +11,6 @@ import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java index 26f39030c..b1c39327a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java @@ -13,7 +13,6 @@ import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.StringUtils; -import com.accompany.core.vo.BaseResponseVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +20,6 @@ import org.springframework.stereotype.Service; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import java.util.Collections; import java.util.Date; @Service diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java index b74560197..862607864 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java @@ -6,8 +6,13 @@ import com.accompany.admin.vo.guild.GuildAdminVo; import com.accompany.admin.vo.guild.GuildMemberAdminVo; import com.accompany.admin.vo.guild.GuildOperateRecordAdminVo; import com.accompany.business.constant.guild.GuildConstant; -import com.accompany.business.model.guild.*; -import com.accompany.business.service.guild.*; +import com.accompany.business.model.guild.Guild; +import com.accompany.business.model.guild.GuildMember; +import com.accompany.business.model.guild.GuildOperateRecord; +import com.accompany.business.service.guild.GuildMemberService; +import com.accompany.business.service.guild.GuildMessageService; +import com.accompany.business.service.guild.GuildOperateRecordService; +import com.accompany.business.service.guild.GuildService; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdWithdrawRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdWithdrawRecordAdminService.java index 88e0a238c..457e558e3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdWithdrawRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildUsdWithdrawRecordAdminService.java @@ -8,15 +8,11 @@ import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.account.AccountBlockService; import com.accompany.business.service.guild.GuildUsdOperateService; import com.accompany.business.service.guild.GuildUsdWithdrawRecordService; -import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.guild.AgencyWithdrawExamineVo; import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.exception.ServiceException; import com.accompany.core.model.AccountBlock; import com.accompany.core.model.PartitionInfo; -import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/invite/impl/UserInviteFissionRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/invite/impl/UserInviteFissionRecordAdminServiceImpl.java index 36cc796c9..e5a0d7d1d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/invite/impl/UserInviteFissionRecordAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/invite/impl/UserInviteFissionRecordAdminServiceImpl.java @@ -24,7 +24,10 @@ import org.springframework.stereotype.Service; import org.springframework.web.context.request.ServletWebRequest; import java.net.URLEncoder; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java index a9965bf5c..55510988d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java @@ -25,11 +25,11 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.FastDateFormat; -import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import javax.validation.constraints.NotNull; import java.util.*; @Service diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java index 40a6937a5..1a0f588f2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java @@ -24,11 +24,11 @@ import com.accompany.core.exception.AdminServiceException; import com.accompany.core.service.common.JedisLockService; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotNull; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java index 63e68c086..e70012b9f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/Lucky24PoolAdminService.java @@ -5,9 +5,6 @@ import com.accompany.admin.service.system.SysConfAdminService; import com.accompany.admin.vo.Lucky24ConfigAdminVo; import com.accompany.admin.vo.luckybag.Lucky24PersonalStatVo; import com.accompany.admin.vo.luckybag.Lucky24PlatformStatVo; -import com.accompany.sharding.mapper.Lucky24RecordMapper; -import com.accompany.sharding.vo.Lucky24PersonalStat; -import com.accompany.sharding.vo.Lucky24PlatformStat; import com.accompany.business.dto.lucky.Lucky24GiftConfig; import com.accompany.business.model.lucky.Lucky24Pool; import com.accompany.business.mybatismapper.lucky.Lucky24PoolMapper; @@ -25,6 +22,9 @@ import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.SysConf; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; +import com.accompany.sharding.mapper.Lucky24RecordMapper; +import com.accompany.sharding.vo.Lucky24PersonalStat; +import com.accompany.sharding.vo.Lucky24PlatformStat; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagCollectAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagCollectAdminServiceImpl.java index 6cd38159c..c5108b21c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagCollectAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagCollectAdminServiceImpl.java @@ -1,14 +1,11 @@ package com.accompany.admin.service.lucky.impl; import com.accompany.admin.dto.lucky.LuckyBagCollectRewardRecordAdminDto; -import com.accompany.admin.dto.lucky.LuckyBagFortunateRecordAdminDto; -import com.accompany.admin.dto.withdraw.WithdrawUserAdminDto; import com.accompany.admin.mapper.lucky.LuckyBagCollectAdminMapper; import com.accompany.admin.mapper.lucky.LuckyBagCollectRewardRecordAdminMapper; import com.accompany.admin.service.lucky.LuckyBagCollectAdminService; import com.accompany.admin.vo.lucky.LuckyBagCollectAdminVo; import com.accompany.business.model.lucky.LuckyBagCollect; -import com.accompany.business.model.lucky.LuckyBagFortunate; import com.accompany.business.service.lucky.LuckyBagCollectService; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRangeConfigAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRangeConfigAdminServiceImpl.java index 5fe6536bf..4112f2565 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRangeConfigAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRangeConfigAdminServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.service.lucky.LuckyGiftRangeConfigAdminService; import com.accompany.business.dto.lucky.LuckyGiftRangeConfigParam; import com.accompany.business.model.lucky.LuckyGiftRangeConfig; -import com.accompany.business.mybatismapper.lucky.LuckyGiftRewardMapper; import com.accompany.business.service.lucky.LuckyGiftRangeConfigService; import com.accompany.common.constant.Constant; import com.accompany.core.exception.AdminServiceException; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java index cdc9aea23..058f47197 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java @@ -28,7 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; /** * @author guojicong diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalAdminService.java index d70f55588..2ca362038 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalAdminService.java @@ -3,13 +3,9 @@ package com.accompany.admin.service.medal; import cn.hutool.core.util.StrUtil; import com.accompany.admin.vo.MedalAdminVo; import com.accompany.business.model.Medal; -import com.accompany.business.model.MedalRecord; -import com.accompany.business.model.UserMedal; -import com.accompany.business.service.medal.MedalRecordService; import com.accompany.business.service.medal.MedalService; import com.accompany.business.service.medal.UserMedalService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.Users; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalRecordAdminService.java index 0dc4892b2..12d7fda8c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/medal/MedalRecordAdminService.java @@ -26,7 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForBaiShunAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForBaiShunAdminService.java index affe6a013..64ee6eff4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForBaiShunAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForBaiShunAdminService.java @@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil; import com.accompany.admin.dto.miniGame.MiniGameForBaiShunAdminDto; import com.accompany.admin.dto.miniGame.MiniGameForBaiShunDetailAdminDto; import com.accompany.admin.mapper.miniGame.MiniGameForBaiShunAdminMapper; -import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForLeaderccAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForLeaderccAdminService.java index 28b66046e..d683dabb7 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForLeaderccAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/miniGame/MiniGameForLeaderccAdminService.java @@ -1,16 +1,15 @@ package com.accompany.admin.service.miniGame; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.accompany.admin.dto.miniGame.MiniGameForBaiShunAdminDto; import com.accompany.admin.dto.miniGame.MiniGameForBaiShunDetailAdminDto; import com.accompany.business.service.user.UsersService; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Users; import com.accompany.sharding.mapper.MiniGameForLeaderccAdminMapper; import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; -import com.accompany.common.utils.DateTimeUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java index 6a76d2d1a..137433d3f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java @@ -32,7 +32,10 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.accompany.common.utils.*; +import com.accompany.common.utils.DateTimeUtil; +import com.accompany.common.utils.FileUtils; +import com.accompany.common.utils.PicAddTextMarkUtils; +import com.accompany.common.utils.UUIDUtil; import com.accompany.core.base.BeanMapper; import com.accompany.core.config.WebLocaleConfig; import com.accompany.core.enumeration.I18nAlertEnum; @@ -56,13 +59,11 @@ import org.springframework.util.StopWatch; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.List; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberAdminService.java index b7a0352ae..5550ea4fd 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberAdminService.java @@ -24,9 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Service public class PrettyNumberAdminService { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java index 90ee3190a..86003fea6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java @@ -16,11 +16,8 @@ import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.PrettyNumber; import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.PrettyNumberMapper; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/PrizePoolItemAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/PrizePoolItemAdminService.java index ed94aac07..1e378be2d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/PrizePoolItemAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/PrizePoolItemAdminService.java @@ -15,10 +15,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.springframework.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/UserBoxPrizeRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/UserBoxPrizeRecordAdminService.java index d0c6fae77..77b6a480b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/UserBoxPrizeRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/UserBoxPrizeRecordAdminService.java @@ -20,9 +20,9 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import org.apache.commons.lang3.time.FastDateFormat; -import org.springframework.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java index cc18e46c9..4e0626c4f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/impl/PrizeDateExcludeUserServiceImpl.java @@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/push/EnterpriseWeChatPushAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/push/EnterpriseWeChatPushAdminService.java index 46bcf2b02..93ca79486 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/push/EnterpriseWeChatPushAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/push/EnterpriseWeChatPushAdminService.java @@ -2,21 +2,17 @@ package com.accompany.admin.service.push; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.system.AdminUserService; -import com.accompany.business.service.user.UsersService; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.AppEnum; import com.accompany.common.push.MarkdownMessage; -import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.EnvComponent; import com.accompany.core.enumeration.PartitionEnum; -import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.message.MessageRobotPushService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeDiamondGiveHistoryAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeDiamondGiveHistoryAdminServiceImpl.java index cfd749404..19e3cc0f4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeDiamondGiveHistoryAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/recharge/impl/RechargeDiamondGiveHistoryAdminServiceImpl.java @@ -16,7 +16,6 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java index d34517994..bbb4013af 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomAdminService.java @@ -12,7 +12,8 @@ import com.accompany.core.service.user.UsersBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.List; @Service public class RoomAdminService extends BaseService { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundAdminService.java index aca3b1b05..1735c24b6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundAdminService.java @@ -19,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundCustomAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundCustomAdminService.java index ae4890476..32fa1cb1b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundCustomAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomBackgroundCustomAdminService.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java index 663f27670..ea21f4c2b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java @@ -16,11 +16,8 @@ import com.accompany.business.model.RoomTag; import com.accompany.business.model.room.RoomPlayType; import com.accompany.business.mybatismapper.HallMapper; import com.accompany.business.sensitvienew.SensitiveFilterUtil; -import com.accompany.business.service.clan.ClanAccountAssociateService; -import com.accompany.business.service.hall.HallService; import com.accompany.business.service.room.*; import com.accompany.business.service.user.UsersService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.business.vo.RoomNotifyVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; @@ -30,8 +27,8 @@ import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.*; import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.core.service.account.AccountService; -import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; +import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.service.user.UsersBaseService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -39,16 +36,15 @@ import com.github.pagehelper.PageInfo; import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; - -import javax.validation.constraints.NotNull; - -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTabHomeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTabHomeAdminService.java index be935354e..b2bf78636 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTabHomeAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTabHomeAdminService.java @@ -1,129 +1,98 @@ package com.accompany.admin.service.room; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; +import com.accompany.business.model.roomtab.RoomTab; import com.accompany.business.model.roomtab.RoomTabHome; import com.accompany.business.model.roomtab.RoomTabNewest; import com.accompany.business.service.homeV2.HomeV2Service; -import com.accompany.business.service.homeV2.filter.HomeRoomFilterEnum; -import com.accompany.business.service.homeV2.filter.HomeRoomFilterService; -import com.accompany.business.service.homeV2.sort.HomeRoomSortService; -import com.accompany.business.service.homeV2.sort.HomeRoomSorterEnum; -import com.accompany.business.service.room.RoomService; import com.accompany.business.service.roomtab.RoomTabHomeService; import com.accompany.business.service.roomtab.RoomTabNewestService; +import com.accompany.business.service.roomtab.RoomTabService; import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.home.PlayRoomVo; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.business.vo.roomtab.RoomTabHomeVo; +import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Room; import com.accompany.core.model.RoomExample; import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.RoomMapper; -import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.core.util.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service public class RoomTabHomeAdminService { - @Autowired - private PartitionInfoService partitionInfoService; - @Autowired - private UsersService usersService; - @Autowired - private RoomService roomService; @Autowired private RoomMapper roomMapper; @Autowired private HomeV2Service homeV2Service; @Autowired - private HomeRoomFilterService filterService; - @Autowired - private HomeRoomSortService sortService; + private RoomTabService roomTabService; @Autowired private RoomTabHomeService roomTabHomeService; @Autowired private RoomTabNewestService roomTabNewestService; + @Autowired + private UsersService usersService; public List roomTabHomeList(Long erbanNo, String roomTitle, Integer partitionId, String simpleName) { - List roomVoList = null; - if (RoomTabHome.class.getSimpleName().equals(simpleName)){ - roomVoList = roomTabHomeList(erbanNo, roomTitle, partitionId, null, HomeRoomSorterEnum.Hot.name()); - } else if (RoomTabNewest.class.getSimpleName().equals(simpleName)){ - roomVoList = roomTabHomeList(erbanNo, roomTitle, partitionId, HomeRoomFilterEnum.Newest_CreateTime.name(), HomeRoomSorterEnum.Hot.name()); + Long uid = null; + if (null != erbanNo || StringUtils.hasText(roomTitle)) { + if (null != erbanNo){ + Users u = usersService.getUserByErbanNo(erbanNo); + if (null != u && u.getPartitionId().equals(partitionId)) { + uid = u.getUid(); + } + } else if (StringUtils.hasText(roomTitle)) { + RoomExample roomExample = new RoomExample(); + roomExample.createCriteria().andTitleLike(roomTitle).andPartitionIdEqualTo(partitionId); + List roomList = roomMapper.selectByExample(roomExample); + if (!CollectionUtils.isEmpty(roomList)) { + uid = roomList.get(0).getUid(); + } + } + if (uid == null) { + return Collections.emptyList(); + } } + RoomTab roomTab = roomTabService.lambdaQuery() + .eq(RoomTabHome.class.getSimpleName().equals(simpleName), RoomTab::getIsHomeRecommend, Constant.status.valid) + .eq(RoomTabNewest.class.getSimpleName().equals(simpleName), RoomTab::getIsHomeNewest, Constant.status.valid) + .eq(RoomTab::getStatus, Constant.status.valid) + .one(); + if (null == roomTab) { + throw new ServiceException(BusiStatus.SERVERBUSY); + } + + List roomVoList = homeV2Service.pageRoomTab(roomTab, null, partitionId, 1, Integer.MAX_VALUE); if (CollectionUtils.isEmpty(roomVoList)){ return Collections.emptyList(); } + if (null != uid){ + Long finalUid = uid; + roomVoList = roomVoList.stream() + .filter(playRoomVo -> playRoomVo.getUid().equals(finalUid)) + .collect(Collectors.toList()); + } + return decorator(roomVoList, simpleName); } - public List roomTabHomeList(Long erbanNo, String roomTitle, Integer partitionId, - String filterStrategy, String sorterStrategy) { - Set uidSet = new HashSet<>(); - if (null != erbanNo){ - Users u = usersService.getUserByErbanNo(erbanNo); - if (null == u){ - return Collections.emptyList(); - } - uidSet.add(u.getUid()); - } - - if (StringUtils.isNoneBlank(roomTitle)){ - RoomExample roomExample = new RoomExample(); - roomExample.createCriteria().andTitleLike(roomTitle); - List roomList = roomMapper.selectByExample(roomExample); - if (CollectionUtils.isEmpty(roomList)){ - return Collections.emptyList(); - } - roomList.forEach(room -> uidSet.add(room.getUid())); - } - - PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); - if (null == partitionInfo){ - return Collections.emptyList(); - } - - Room room = roomService.getRoomByRoomId(partitionInfo.getPublicChatRoomId()); - if (null == room){ - return Collections.emptyList(); - } - - Set roomUidSet = homeV2Service.getPartitionPoolSet(partitionId); - - if (!CollectionUtils.isEmpty(uidSet)){ - roomUidSet.retainAll(uidSet); - } - - if (CollectionUtils.isEmpty(roomUidSet)){ - return Collections.emptyList(); - } - - filterService.filter(roomUidSet, room.getUid(), filterStrategy); - - if (CollectionUtils.isEmpty(roomUidSet)){ - return Collections.emptyList(); - } - - List roomUidList = sortService.sort(roomUidSet, room.getUid(), sorterStrategy); - - return homeV2Service.decorator(roomUidList, partitionId); - } - - private List decorator(List roomVoList, String simpleName) { + private List decorator(List roomVoList, String simpleName) { Map roomTabHomeMap = (RoomTabHome.class.getSimpleName().equals(simpleName)? roomTabHomeService.lambdaQuery().list(): roomTabNewestService.lambdaQuery().list()) .stream().collect(Collectors.toMap(RoomTabHome::getRoomUid, roomTabHome->roomTabHome)); @@ -140,7 +109,7 @@ public class RoomTabHomeAdminService { vo.setMicUserCount(playRoomVo.getMicUserCount()); vo.setOnlineNum(playRoomVo.getOnlineNum()); vo.setIsHourTop1(playRoomVo.getIsHourTop1() > 0); - vo.setIsWeekTop1(playRoomVo.getIsWeekTop1() > 0); + //vo.setIsWeekTop1(playRoomVo.getIsWeekTop1() > 0); vo.setCrossPking(playRoomVo.getCrossPking()); RoomTabHome home = roomTabHomeMap.get(playRoomVo.getUid()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagAdminService.java index ac070fd05..418b883cd 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagAdminService.java @@ -6,14 +6,14 @@ import com.accompany.admin.vo.RoomTagAdminVo; import com.accompany.business.model.RoomTag; import com.accompany.business.model.RoomTagExample; import com.accompany.business.mybatismapper.RoomTagMapper; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.common.constant.Constant; +import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.service.base.BaseService; +import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java index 2f7aba337..93a2a5406 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java @@ -10,7 +10,6 @@ import com.accompany.business.constant.NetEaseLeaveModeConstant; import com.accompany.business.model.*; import com.accompany.business.model.redis.RoomMic; import com.accompany.business.mybatismapper.*; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.hall.HallAuthService; import com.accompany.business.service.hall.HallManageService; @@ -19,6 +18,7 @@ import com.accompany.business.service.room.*; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/InviteCodeStatsService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/InviteCodeStatsService.java index c2fd480f5..465ab51d2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/InviteCodeStatsService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/InviteCodeStatsService.java @@ -12,8 +12,6 @@ package com.accompany.admin.service.statistic; import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.vo.stats.InviteCodeStatsVo; -import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.UserInviteCode; import com.accompany.business.mybatismapper.UsersMapperExpend; import com.accompany.business.service.user.InviteCodeService; @@ -23,6 +21,8 @@ import com.accompany.common.utils.StringUtils; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; import com.accompany.payment.model.ChargeRecord; +import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; +import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/PermitRoomStatsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/PermitRoomStatsAdminService.java index 17e354bfa..fd8606c2f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/PermitRoomStatsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/PermitRoomStatsAdminService.java @@ -1,6 +1,5 @@ package com.accompany.admin.service.statistic; -import cn.hutool.core.date.DatePattern; import com.accompany.admin.mapper.PermitRoomStatsMapper; import com.accompany.admin.service.base.BaseService; import com.accompany.admin.vo.stats.PermitRoomRemainRecordVo; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java index b4b1e5971..f05711204 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java @@ -8,10 +8,7 @@ import com.accompany.admin.mapper.ChargeRecordAdminMapper; import com.accompany.admin.mapper.UserMapperExpand; import com.accompany.admin.service.base.BaseService; import com.accompany.admin.service.room.RoomVisitorService; -import com.accompany.admin.vo.flowteam.FlowTeamConfVO; import com.accompany.admin.vo.stats.UserDetailVo; -import com.accompany.business.dto.flow.FlowTeamMemberBaseDto; -import com.accompany.business.model.FirstChargeRewardRecord; import com.accompany.business.model.UserInRoomRecord; import com.accompany.business.model.room.RoomVisitor; import com.accompany.business.model.room.RoomVisitorUserDict; @@ -21,7 +18,6 @@ import com.accompany.business.mybatismapper.room.RoomVisitorMapper; import com.accompany.business.mybatismapper.room.RoomVisitorUserDictMapper; import com.accompany.business.service.charge.FirstChargeRewardRecordService; import com.accompany.business.service.user.UserLoginService; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; @@ -34,12 +30,9 @@ import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisLockService; import com.accompany.payment.model.ChargeRecord; -import com.accompany.sharding.mapper.UserInOutRoomRecordMapper; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.common.collect.Maps; import com.xuanyin.flowteam.constant.FlowTeamConstant; import com.xuanyin.flowteam.mapper.FlowTeamGroupMapper; import com.xuanyin.flowteam.mapper.FlowTeamInfoMapper; @@ -47,9 +40,6 @@ import com.xuanyin.flowteam.mapper.FlowTeamMemberInviteUserMapper; import com.xuanyin.flowteam.model.FlowTeamGroup; import com.xuanyin.flowteam.model.FlowTeamInfo; import com.xuanyin.flowteam.model.FlowTeamMemberInviteUser; - -import javax.validation.constraints.NotNull; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -57,7 +47,10 @@ import org.springframework.util.StopWatch; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Service diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPartitionService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPartitionService.java index 008cf9eb1..52e5d395b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPartitionService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminPartitionService.java @@ -1,6 +1,5 @@ package com.accompany.admin.service.system; -import com.accompany.admin.mapper.AdminMenuMapper; import com.accompany.admin.mapper.AdminRefRolePartitionMapper; import com.accompany.admin.model.AdminRefRolePartition; import com.accompany.admin.model.AdminRefUserRoleKey; @@ -9,7 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.Collections; +import java.util.List; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/I18nMessageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/I18nMessageAdminService.java index 142790ac8..c24394c36 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/I18nMessageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/I18nMessageAdminService.java @@ -8,7 +8,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Properties; /** diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java index 31ebc986c..8f610b14c 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java @@ -35,7 +35,6 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.time.DateUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAuthInfoAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAuthInfoAdminService.java index 79c749f6d..d6686f231 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAuthInfoAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAuthInfoAdminService.java @@ -17,7 +17,6 @@ import com.accompany.admin.vo.vip.VipAuthInfoAdminVo; import com.accompany.business.model.vip.VipAuthInfo; import com.accompany.business.service.vip.VipAuthInfoService; import com.accompany.common.constant.Constant; -import com.accompany.common.utils.BeanUtil; import com.accompany.core.util.I18NMessageSourceUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipSendAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipSendAdminService.java index 342582814..419098f80 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipSendAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipSendAdminService.java @@ -1,10 +1,10 @@ package com.accompany.admin.service.vip; -import com.accompany.business.mybatismapper.vip.VipSendRecordMapper; import com.accompany.admin.model.AdminUser; -import com.accompany.business.model.vip.VipSendRecord; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.vo.vip.VipSendRecordVo; +import com.accompany.business.model.vip.VipSendRecord; +import com.accompany.business.mybatismapper.vip.VipSendRecordMapper; import com.accompany.business.service.user.UsersService; import com.accompany.business.service.vip.VipSendService; import com.accompany.common.constant.Constant; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java index c7cb8db4e..51acfc3b6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java @@ -12,9 +12,9 @@ import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.Users; import com.alipay.api.internal.util.StringUtils; import com.github.pagehelper.PageHelper; -import org.springframework.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldAdminService.java index 252ff9fa1..49f781874 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldAdminService.java @@ -2,7 +2,6 @@ package com.accompany.admin.service.world; import com.accompany.admin.dto.WorldSearchDto; import com.accompany.admin.service.base.BaseService; -import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.admin.vo.WorldAdminVo; import com.accompany.business.sensitvienew.SensitiveFilterUtil; import com.accompany.business.service.user.UsersService; @@ -12,6 +11,7 @@ import com.accompany.common.status.BusiStatus; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.user.UsersBaseService; +import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.StringUtils; import com.accompany.world.common.WorldException; import com.accompany.world.constant.WorldConstant; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicVerifyAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicVerifyAdminService.java index 532ca70d4..aaad6b3e4 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicVerifyAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicVerifyAdminService.java @@ -13,7 +13,6 @@ import com.accompany.business.event.DynamicVerifyEvent; import com.accompany.business.service.community.CommunityMessageService; import com.accompany.business.service.community.DynamicService; import com.accompany.business.service.community.DynamicSquareService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.business.service.user.UsersService; import com.accompany.business.service.world.WorldService; import com.accompany.common.constant.Constant; @@ -28,6 +27,7 @@ import com.accompany.community.service.IDynamicService; import com.accompany.core.base.BeanMapper; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; +import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.StringUtils; import com.accompany.world.entity.World; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java index b42aa6b00..48180f144 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java @@ -1,22 +1,15 @@ package com.accompany.admin.util; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.text.DecimalFormat; -import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * POI Excel帮助类。 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java index 95bd30e95..dc8f0fa14 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/WebMvcConfig.java @@ -6,7 +6,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.commons.CommonsMultipartResolver; -import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * Created by PaperCut on 2018/9/17. diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/BaseController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/BaseController.java index bc3e3bced..75db3aecc 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/BaseController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/BaseController.java @@ -2,13 +2,10 @@ package com.accompany.admin.controller; import cn.dev33.satoken.stp.StpUtil; -import com.accompany.admin.common.AdminConstants; import com.accompany.admin.frame.MvcContext; -import com.accompany.admin.frame.Scope; import com.accompany.admin.support.CustomDateEditor; import com.accompany.common.utils.BlankUtil; import com.alibaba.fastjson.JSON; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java index 39ebe3ff8..5984b0a6e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java @@ -1,14 +1,14 @@ package com.accompany.admin.controller; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.dto.ChannelDistributeSearchDto; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.ChannelDistributeAdminService; import com.accompany.admin.service.system.AdminUserService; import com.accompany.business.model.ChannelDistribute; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ErBanNetEaseController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ErBanNetEaseController.java index 8cb06e30d..e462faa31 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ErBanNetEaseController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ErBanNetEaseController.java @@ -3,12 +3,12 @@ package com.accompany.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.enums.message.ContentTypeEnum; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.netease.neteaseacc.result.ChatMessageResult; import com.accompany.business.vo.message.*; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; +import com.accompany.common.netease.neteaseacc.result.ChatMessageResult; import com.accompany.common.netease.neteaseacc.result.RoomMemberRet; import com.accompany.common.netease.neteaseacc.result.RoomUserListRet; import com.accompany.common.netease.util.NetEaseConstant; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ExceptionController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ExceptionController.java index 460757c48..6e9078b36 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ExceptionController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ExceptionController.java @@ -1,8 +1,8 @@ package com.accompany.admin.controller; -import com.accompany.core.exception.ServiceException; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java index 7c677ce8c..8e597117f 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; -import springfox.documentation.swagger.readers.operation.OperationAuthReader; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java index 7596bb932..7f96717f7 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActCallBattleAdminController.java @@ -22,14 +22,11 @@ import com.accompany.business.model.callbattle.ActCallBattleItem; import com.accompany.business.service.callbattle.ActCallBattleBizService; import com.accompany.business.service.callbattle.ActCallBattleInfoService; import com.accompany.business.service.callbattle.ActCallBattleStockService; -import com.accompany.business.service.callbattle.impl.ActCallBattleBizServiceImpl; import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.PinYin4JUtil; - import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityAwardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityAwardAdminController.java index 74bd1fc27..f8cfa22b7 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityAwardAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityAwardAdminController.java @@ -1,12 +1,12 @@ package com.accompany.admin.controller.activity; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.activity.ActivityAwardAdminService; import com.accompany.business.model.ActivityAward; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityPackAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityPackAdminController.java index 6d00d33c2..b29437840 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityPackAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityPackAdminController.java @@ -1,6 +1,5 @@ package com.accompany.admin.controller.activity; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.activity.ActivityPackAdminService; import com.accompany.admin.service.system.AdminLogService; @@ -8,6 +7,7 @@ import com.accompany.business.model.ActivityPack; import com.accompany.business.vo.activity.ActivityPackAwardItem; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityAdminController.java index 4237951b0..1b3560d72 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityAdminController.java @@ -1,18 +1,18 @@ package com.accompany.admin.controller.activity; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.ChargeActivitySearchDto; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.activity.ChargeActivityService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.service.system.AdminUserService; -import com.accompany.core.exception.ServiceException; import com.accompany.business.model.ChargeActivity; import com.accompany.business.model.ChargeActivityWithBLOBs; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java index 68c26b6fd..db1228442 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java @@ -20,7 +20,6 @@ import com.accompany.common.status.BusiStatus; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.PinYin4JUtil; - import com.accompany.core.exception.ServiceException; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.excel.EasyExcel; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java index 0070398d1..c0d064334 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java @@ -1,12 +1,12 @@ package com.accompany.admin.controller.activity; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.activity.OperationActAdminService; import com.accompany.business.model.OperationAct; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/administrator/SuperAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/administrator/SuperAdminController.java index 50f8202dc..75293cb86 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/administrator/SuperAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/administrator/SuperAdminController.java @@ -1,10 +1,10 @@ package com.accompany.admin.controller.administrator; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.administrator.SuperAdminService; import com.accompany.core.model.Users; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorAdminController.java index af836a970..2494cc5e2 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorAdminController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.anchor; -import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.anchor.AnchorAdminService; import com.accompany.business.model.AnchorWhitelist; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorFansTeamAudioAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorFansTeamAudioAdminController.java index 047cb9e7b..11fe3939a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorFansTeamAudioAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorFansTeamAudioAdminController.java @@ -3,7 +3,6 @@ package com.accompany.admin.controller.anchor; import com.accompany.admin.controller.BaseController; import com.accompany.business.service.anchor.AnchorFansTeamAudioRecordService; import com.accompany.business.vo.anchor.AnchorFansTeamAudioRecordVo; -import com.accompany.core.exception.ServiceException; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorReleaseAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorReleaseAdminController.java index 0830e6abd..ef8dad668 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorReleaseAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorReleaseAdminController.java @@ -1,15 +1,15 @@ package com.accompany.admin.controller.anchor; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.anchor.AnchorCheckAdminService; import com.accompany.admin.service.anchor.AnchorReleaseAdminService; import com.accompany.business.model.AnchorBillCheck; import com.accompany.business.model.AnchorBillRecord; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java index 33634951a..15e0ea925 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/blinddate/BlindDateAdminController.java @@ -23,7 +23,6 @@ import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -31,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java index f9c73b329..9a1a23523 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java @@ -7,6 +7,7 @@ import com.accompany.admin.vo.boom.RoomBoomAwardRecordVO; import com.accompany.admin.vo.boom.RoomBoomSignVO; import com.accompany.business.model.room.RoomBoomAwardRecord; import com.accompany.business.model.room.RoomBoomSign; +import com.accompany.business.param.BasePageParams; import com.accompany.business.service.room.RoomBoomAwardRecordService; import com.accompany.business.service.room.RoomBoomSignService; import com.accompany.business.service.room.RoomService; @@ -33,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.accompany.business.param.BasePageParams; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarGoodsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarGoodsAdminController.java index 0add4fd64..90eaebf19 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarGoodsAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarGoodsAdminController.java @@ -6,7 +6,6 @@ import com.accompany.admin.controller.BaseController; import com.accompany.business.model.CarGoods; import com.accompany.business.service.car.CarGoodsService; import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.common.utils.PinYin4JUtil; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeRegionAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeRegionAdminController.java index f2051c8a4..e84557bb4 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeRegionAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeRegionAdminController.java @@ -2,10 +2,9 @@ package com.accompany.admin.controller.charge; import com.accompany.admin.service.charge.ChargeChannelAdminService; import com.accompany.admin.service.charge.ChargeRegionAdminService; +import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; import com.accompany.payment.model.ChargeRegion; -import com.accompany.common.result.BusiResult; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/RedeemCodeController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/RedeemCodeController.java index 9d1f6326a..42316a080 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/RedeemCodeController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/RedeemCodeController.java @@ -1,14 +1,14 @@ package com.accompany.admin.controller.charge; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.charge.RedeemCodeService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.business.model.RedeemCode; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/clan/ClanAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/clan/ClanAdminController.java index 422206cdd..09faf0cc7 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/clan/ClanAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/clan/ClanAdminController.java @@ -20,7 +20,6 @@ import com.accompany.business.model.clan.ClanLevelSetting; import com.accompany.business.vo.clan.ClanFlowIncomeDetailDayVO; import com.accompany.business.vo.clan.ClanFlowIncomeDetailVO; import com.accompany.business.vo.clan.ClanFlowIncomeVO; - import com.accompany.common.status.BusiStatus; import com.accompany.core.util.ExcelUtils; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/cleanup/CleanUpAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/cleanup/CleanUpAdminController.java index 9853ea7c1..aebe8c222 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/cleanup/CleanUpAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/cleanup/CleanUpAdminController.java @@ -2,11 +2,9 @@ package com.accompany.admin.controller.cleanup; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.cleanup.CleanUpAdminService; -import com.accompany.business.service.activities.ActivitiesDrawService; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/common/UploadAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/common/UploadAdminController.java index effe654e9..f70cfe0cc 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/common/UploadAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/common/UploadAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.common; import cn.hutool.core.util.StrUtil; import com.accompany.admin.controller.BaseController; -import com.accompany.common.config.QiNiuConfig; import com.accompany.common.config.TencentCosConfig; import com.accompany.common.result.BusiResult; import com.accompany.common.tencent.cos.TencentCosUploadService; @@ -11,7 +10,6 @@ import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/customservice/CustomServiceAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/customservice/CustomServiceAdminController.java index 5cc982644..8c871f9bb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/customservice/CustomServiceAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/customservice/CustomServiceAdminController.java @@ -1,11 +1,11 @@ package com.accompany.admin.controller.customservice; -import com.alibaba.fastjson.JSON; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.customservice.CustomServiceAdminService; -import com.accompany.core.exception.ServiceException; import com.accompany.business.model.CustomService; import com.accompany.business.mybatismapper.CustomServiceMapper; +import com.accompany.core.exception.ServiceException; +import com.alibaba.fastjson.JSON; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/InfoCardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/InfoCardAdminController.java index c7a49e5f2..4e52c113a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/InfoCardAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/InfoCardAdminController.java @@ -13,7 +13,6 @@ package com.accompany.admin.controller.dress; import com.accompany.admin.base.Pagination; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.dress.InfoCardAdminService; -import com.accompany.business.model.dress.ChatBubble; import com.accompany.business.model.dress.InfoCard; import com.accompany.common.result.BusiResult; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/PersonalBackgroundAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/PersonalBackgroundAdminController.java index 80fa2bc30..3de72db23 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/PersonalBackgroundAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/PersonalBackgroundAdminController.java @@ -7,7 +7,6 @@ import com.accompany.admin.service.dress.PersonalBackgroundAdminService; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.vo.dress.UserPersonalBackgroundRecordAdminVO; import com.accompany.business.model.dress.PersonalBackground; -import com.accompany.common.result.BusiResult; import com.accompany.core.vo.BaseResponseVO; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** *
类描述: diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyIncomeAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyIncomeAdminController.java index faabe81c9..5b28e9ec5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyIncomeAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyIncomeAdminController.java @@ -3,7 +3,6 @@ package com.accompany.admin.controller.family; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.family.FamilyIncomeAdminService; import com.accompany.admin.vo.family.FamilyIncomeAdminVo; -import com.accompany.admin.vo.family.FamilyMemberAdminVo; import com.accompany.admin.vo.family.FamilyMemberIncomeAdminVo; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyManageAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyManageAdminController.java index 829a565c4..869bd60ef 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyManageAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyManageAdminController.java @@ -6,13 +6,10 @@ import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.vo.family.FamilyAdminVo; import com.accompany.admin.vo.family.FamilyMemberAdminVo; import com.accompany.admin.vo.family.FamilyOperateRecordAdminVo; -import com.accompany.admin.vo.luckysea.LuckySeaActPlatformStatVo; -import com.accompany.admin.vo.seekelfin.SeekElfinAdminUserRecordVO; -import com.accompany.business.model.family.FamilyPayAccount; import com.accompany.common.result.BusiResult; +import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; -import com.accompany.common.result.PageResult; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,7 +24,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyMemberViolationAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyMemberViolationAdminController.java index 0741b8bed..8d75245db 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyMemberViolationAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyMemberViolationAdminController.java @@ -6,9 +6,9 @@ import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.vo.family.FamilyMemberViolationRecordAdminVo; import com.accompany.business.model.family.FamilyMemberViolation; import com.accompany.common.result.BusiResult; +import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; -import com.accompany.common.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyWageStatAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyWageStatAdminController.java index 1f3284f8f..09bb3cc8a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyWageStatAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/family/FamilyWageStatAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.family; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.family.FamilyWageStatAdminService; -import com.accompany.admin.vo.family.FamilyAdminVo; import com.accompany.admin.vo.family.FamilyMemberDailyWageStatAdminVo; import com.accompany.admin.vo.family.FamilyMemberWageStatAdminVo; import com.accompany.admin.vo.family.FamilyWageStatAdminVo; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java index 34e15865b..7fc765a49 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.feedback; import com.accompany.admin.base.Pagination; import com.accompany.admin.controller.BaseController; -import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.AccountBlockAdminService; import com.accompany.admin.service.system.AdminUserService; import com.accompany.business.service.account.AccountBlockService; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordController.java index 410394855..f70a6a01f 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordController.java @@ -1,12 +1,10 @@ package com.accompany.admin.controller.feedback; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.AccountLoginRecordService; import com.accompany.core.model.AccountLoginRecord; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/MessageAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/MessageAdminController.java index cc54af5be..5dbe716a9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/MessageAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/MessageAdminController.java @@ -1,17 +1,15 @@ package com.accompany.admin.controller.feedback; +import com.accompany.admin.controller.BaseController; +import com.accompany.admin.service.MsgPushAdminService; import com.accompany.admin.vo.message.RecallQO; +import com.accompany.business.model.MsgPushRecord; +import com.accompany.business.service.SendSysMsgService; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.MsgPushAdminService; -import com.accompany.business.model.MsgPushRecord; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.api.QinniuService; import com.github.pagehelper.PageInfo; -import com.accompany.common.utils.BlankUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawDataAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawDataAdminController.java index 023762d3b..349661a78 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawDataAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawDataAdminController.java @@ -12,7 +12,9 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/firstpage/FirstPageBannerAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/firstpage/FirstPageBannerAdminController.java index c15d797d0..5d5261503 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/firstpage/FirstPageBannerAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/firstpage/FirstPageBannerAdminController.java @@ -6,7 +6,6 @@ import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.firstpage.FirstPageBannerAdminService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.service.system.AdminUserService; -import com.accompany.admin.util.PartitionBannerWrapper; import com.accompany.business.model.firstpage.FirstPageBanner; import com.accompany.business.service.firstpage.FirstPageBannerService; import com.accompany.common.result.BusiResult; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamAdminController.java index 370887111..4c47c9303 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamAdminController.java @@ -10,10 +10,8 @@ import com.accompany.admin.service.flowteam.FlowTeamMemberInviteUserAdminService import com.accompany.admin.service.flowteam.FlowTeamService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.vo.flowteam.*; -import com.accompany.business.service.user.UsersService; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; - import com.accompany.core.model.Users; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSON; @@ -30,7 +28,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamSettlementInfoController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamSettlementInfoController.java index 31b638872..e8c79f8f4 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamSettlementInfoController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/flowteam/FlowTeamSettlementInfoController.java @@ -13,13 +13,13 @@ package com.accompany.admin.controller.flowteam; import cn.hutool.core.text.StrBuilder; import com.accompany.admin.base.Pagination; import com.accompany.admin.controller.BaseController; -import com.xuanyin.flowteam.model.FlowTeamSettlementInfo; import com.accompany.admin.service.flowteam.FlowTeamService; -import com.accompany.business.service.flow.FlowTeamSettlementBizService; import com.accompany.admin.vo.flowteam.FlowTeamConfVO; -import com.xuanyin.flowteam.dto.FlowTeamSettlementDetail; +import com.accompany.business.service.flow.FlowTeamSettlementBizService; import com.accompany.common.utils.DateTimeUtil; import com.github.pagehelper.PageInfo; +import com.xuanyin.flowteam.dto.FlowTeamSettlementDetail; +import com.xuanyin.flowteam.model.FlowTeamSettlementInfo; import io.swagger.annotations.ApiOperation; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java index afb6add51..468cfcb6c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java @@ -10,7 +10,6 @@ import com.accompany.admin.service.push.EnterpriseWeChatPushAdminService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.business.dto.room.RoomFreeGiftConfigDto; import com.accompany.business.model.Gift; -import com.accompany.sharding.vo.GiftSendRecordStatistics; import com.accompany.business.model.UserPurse; import com.accompany.business.service.gift.GiftSendRecordService; import com.accompany.business.service.gift.GiftService; @@ -27,6 +26,7 @@ import com.accompany.common.utils.StringUtils; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; +import com.accompany.sharding.vo.GiftSendRecordStatistics; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialAdminController.java index ebca00a96..6196ffaa6 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialAdminController.java @@ -13,7 +13,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.RandomUtil; - import com.accompany.core.exception.AdminServiceException; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java index 57b65d7a9..b4392401d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/AgencyWithdrawExamineController.java @@ -4,10 +4,8 @@ import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.guild.GuildUsdWithdrawRecordAdminService; import com.accompany.admin.service.system.AdminUserService; import com.accompany.business.param.BasePageParams; -import com.accompany.business.service.guild.GuildUsdWithdrawRecordService; import com.accompany.business.vo.guild.AgencyWithdrawExamineVo; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.excel.EasyExcel; @@ -15,21 +13,17 @@ import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import lombok.SneakyThrows; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildDiamondStatisticsDayAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildDiamondStatisticsDayAdminController.java index e1841123b..1c879584b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildDiamondStatisticsDayAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildDiamondStatisticsDayAdminController.java @@ -1,7 +1,6 @@ package com.accompany.admin.controller.guild; import com.accompany.admin.service.guild.GuildDiamondStatisticsDayAdminService; -import com.accompany.admin.vo.guild.GuildAdminVo; import com.accompany.business.param.BasePageParams; import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/SsMonthCoinRecordController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/SsMonthCoinRecordController.java index 19b30734a..99773ad1e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/SsMonthCoinRecordController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/SsMonthCoinRecordController.java @@ -3,14 +3,12 @@ package com.accompany.admin.controller.guild; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.system.AdminUserService; import com.accompany.business.service.guild.SsMonthCoinRecordService; -import com.accompany.business.vo.guild.AgencyMonthSettleDetailVo; import com.accompany.business.vo.guild.GuildCycleDateVo; import com.accompany.business.vo.guild.SsMonthCoinRecordVo; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.model.PartitionInfo; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/hall/HallAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/hall/HallAdminController.java index 71c95a174..260c2a952 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/hall/HallAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/hall/HallAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.hall; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.hall.HallAdminService; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearAdminController.java index 58716a224..aa19194d5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearAdminController.java @@ -1,15 +1,13 @@ package com.accompany.admin.controller.headwear; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.headwear.HeadwearAdminService; -import com.accompany.core.exception.ServiceException; import com.accompany.business.model.Headwear; import com.accompany.business.model.HeadwearStatistics; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearRecordController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearRecordController.java index b3149daab..68ad9a07b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearRecordController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearRecordController.java @@ -8,7 +8,8 @@ import com.accompany.common.status.BusiStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/admin/headwearRecord") diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/invite/UserInviteFissionRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/invite/UserInviteFissionRecordAdminController.java index 0dfb1e4d9..752397cb5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/invite/UserInviteFissionRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/invite/UserInviteFissionRecordAdminController.java @@ -20,8 +20,6 @@ import org.springframework.web.context.request.ServletWebRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Collections; -import java.util.Date; -import java.util.List; /** * @author: liaozetao diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java index 8f2b44310..17ac6da57 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java @@ -11,7 +11,6 @@ import com.accompany.admin.vo.linearlypool.LinearlyPoolItemAdminPageVO; import com.accompany.admin.vo.linearlypool.PrizeItemVO; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24ConfigAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24ConfigAdminController.java index c3cc195f2..95ecf6807 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24ConfigAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24ConfigAdminController.java @@ -2,13 +2,9 @@ package com.accompany.admin.controller.lucky; import com.accompany.admin.service.lucky.Lucky24PoolAdminService; import com.accompany.admin.vo.Lucky24ConfigAdminVo; -import com.accompany.business.constant.Lucky24PoolTypeEnum; -import com.accompany.business.dto.lucky.Lucky24GiftConfig; -import com.accompany.business.model.lucky.Lucky24Pool; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; -import com.accompany.core.exception.ServiceException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -16,12 +12,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - @Api(tags = "幸运24") @RestController @RequestMapping("/admin/lucky24/config") diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24PoolAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24PoolAdminController.java index 6e528ee35..52b575b0d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24PoolAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/Lucky24PoolAdminController.java @@ -1,28 +1,20 @@ package com.accompany.admin.controller.lucky; import com.accompany.admin.service.lucky.Lucky24PoolAdminService; -import com.accompany.admin.service.lucky.LuckyBagCollectAdminService; -import com.accompany.admin.vo.lucky.LuckyBagCollectAdminVo; import com.accompany.business.constant.Lucky24PoolTypeEnum; import com.accompany.business.model.lucky.Lucky24Pool; -import com.accompany.business.model.lucky.LuckyBagCollect; -import com.accompany.common.model.PageReq; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.ServletWebRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagFortunateAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagFortunateAdminController.java index fe0834e6d..2883e4e53 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagFortunateAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagFortunateAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.lucky; import com.accompany.admin.service.lucky.LuckyBagFortunateAdminService; import com.accompany.admin.service.lucky.LuckyBagFortunateRecordAdminService; -import com.accompany.admin.vo.lucky.LuckyBagCollectAdminVo; import com.accompany.admin.vo.lucky.LuckyBagFortunateAdminVo; import com.accompany.admin.vo.lucky.LuckyBagFortunateRecordAdminVo; import com.accompany.business.model.lucky.LuckyBagFortunate; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagWeekRankAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagWeekRankAdminController.java index 8a3d5dac2..a8ec6c140 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagWeekRankAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/lucky/LuckyBagWeekRankAdminController.java @@ -4,9 +4,9 @@ import com.accompany.admin.service.luckybag.LuckyBagWeekRankAdminService; import com.accompany.admin.vo.lucky.LuckyBagWeekRankAdminVo; import com.accompany.business.vo.activity.RankActVo; import com.accompany.common.result.BusiResult; +import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; -import com.accompany.common.result.PageResult; import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameAdminController.java index b5a398549..93cbc528a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameAdminController.java @@ -1,25 +1,14 @@ package com.accompany.admin.controller.miniGame; -import com.accompany.admin.base.Pagination; import com.accompany.admin.service.miniGame.MiniGameAdminService; -import com.accompany.business.dto.miniGame.MiniGameDetailParam; -import com.accompany.business.dto.miniGame.MiniGameRoundDetailDto; -import com.accompany.business.dto.miniGame.MiniGameStatisByDayDto; -import com.accompany.business.dto.miniGame.MiniGameStatisParam; import com.accompany.business.model.miniGame.MiniGame; import com.accompany.common.result.BusiResult; -import com.accompany.core.util.ExcelUtils; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameFoLeaderccAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameFoLeaderccAdminController.java index 6aaf3283c..e3662304d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameFoLeaderccAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameFoLeaderccAdminController.java @@ -1,8 +1,8 @@ package com.accompany.admin.controller.miniGame; import com.accompany.admin.service.miniGame.MiniGameForLeaderccAdminService; -import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.accompany.common.result.BusiResult; +import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForBaiShunAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForBaiShunAdminController.java index d2c06a954..8f790aca0 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForBaiShunAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForBaiShunAdminController.java @@ -1,8 +1,8 @@ package com.accompany.admin.controller.miniGame; import com.accompany.admin.service.miniGame.MiniGameForBaiShunAdminService; -import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.accompany.common.result.BusiResult; +import com.accompany.sharding.vo.MiniGameForBaiShunAdminVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForNavAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForNavAdminController.java index bd8bc3f1e..3b10721f8 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForNavAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameForNavAdminController.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAdminController.java index 6b9e65291..3446ab242 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAdminController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.nameplate; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; -import com.alibaba.fastjson.JSON; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.NameplateDto; import com.accompany.admin.service.nameplate.NameplateAdminService; import com.accompany.business.model.Nameplate; +import com.accompany.common.result.BusiResult; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.AdminServiceException; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAuditRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAuditRecordAdminController.java index ae802fb80..22e757b9f 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAuditRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/nameplate/NameplateAuditRecordAdminController.java @@ -3,7 +3,6 @@ package com.accompany.admin.controller.nameplate; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.nameplate.NameplateAuditRecordAdminService; import com.accompany.business.vo.nameplate.NameplateAuditRecordVo; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagAdminController.java index 6c12ada5e..ccccf914c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagAdminController.java @@ -12,7 +12,6 @@ import com.accompany.business.model.luckybag.LuckyBagGiftDeviateRange; import com.accompany.business.service.gift.GiftService; import com.accompany.business.vo.newLuckyBag.NewLuckyBagPoolItemAdminVo; import com.accompany.common.constant.Constant; - import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/partition/PartitionInfoAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/partition/PartitionInfoAdminController.java index 0fa682a29..c963b4def 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/partition/PartitionInfoAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/partition/PartitionInfoAdminController.java @@ -2,9 +2,9 @@ package com.accompany.admin.controller.partition; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.system.AdminPartitionService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.common.result.BusiResult; import com.accompany.core.model.PartitionInfo; +import com.accompany.core.service.partition.PartitionInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserCardsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserCardsAdminController.java index 09facaf7d..f5c5172a5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserCardsAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserCardsAdminController.java @@ -12,7 +12,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.constant.OpenBoxKeyTypeEnum; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.StringUtils; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeRiskUserAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeRiskUserAdminController.java index c110d81a9..68eecd90d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeRiskUserAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeRiskUserAdminController.java @@ -8,7 +8,10 @@ import com.accompany.common.result.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Api(tags = "充值风险用户管理") @RestController diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java index 9ea3b0310..3d2f2ee12 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java @@ -1,17 +1,16 @@ package com.accompany.admin.controller.record; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.record.OfficialGiveKeyService; import com.accompany.admin.service.record.UserService; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.vo.UserKeyVo; import com.accompany.admin.vo.UsersVo; -import com.accompany.business.service.box.UserPrizeKeyService; -import com.google.common.collect.Maps; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java index 2f0a874de..0c5e457d7 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GoldCoinController.java @@ -1,7 +1,5 @@ package com.accompany.admin.controller.record; -import com.accompany.business.service.purse.UserPurseService; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.record.OfficialGoldRecordService; import com.accompany.admin.service.record.UserService; @@ -9,12 +7,14 @@ import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.vo.OfficialGoldRecordVo; import com.accompany.admin.vo.UsersVo; import com.accompany.business.constant.OfficalSendTypeEnum; -import com.google.common.collect.Maps; +import com.accompany.business.service.purse.UserPurseService; import com.accompany.common.constant.Constant; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.DateTimeUtil; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Maps; import io.swagger.annotations.ApiOperation; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/OfficialGoldBusTypeController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/OfficialGoldBusTypeController.java index 6f9e4bcac..7df6bfaa9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/OfficialGoldBusTypeController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/OfficialGoldBusTypeController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.record; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.model.OfficialGoldBusTypeQuery; import com.accompany.admin.service.record.OfficialGoldBusTypeAdminService; import com.accompany.business.model.OfficialGoldBusType; -import com.google.common.collect.Maps; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Maps; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/redenvelope/RedEnvelopeAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/redenvelope/RedEnvelopeAdminController.java index 4f746bfdc..4c3b9520c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/redenvelope/RedEnvelopeAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/redenvelope/RedEnvelopeAdminController.java @@ -11,12 +11,16 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.ServletWebRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; @RestController @RequestMapping("/admin/redEnvelope") diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/CrossRoomPkAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/CrossRoomPkAdminController.java index 9f2ca15d2..61da57b1c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/CrossRoomPkAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/CrossRoomPkAdminController.java @@ -11,7 +11,6 @@ import com.accompany.business.service.room.CrossRoomPkRoundService; import com.accompany.common.constant.Constant; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - import com.accompany.core.exception.AdminServiceException; import com.accompany.core.util.ExcelUtils; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundAdminController.java index 95ba42749..a4cc4a955 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundAdminController.java @@ -2,7 +2,6 @@ package com.accompany.admin.controller.room; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.room.RoomBackgroundAdminService; -import com.accompany.admin.service.room.RoomBackgroundCustomAdminService; import com.accompany.admin.vo.RoomBackgroundAdminVo; import com.accompany.common.model.PageReq; import com.accompany.common.result.BusiResult; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundCustomAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundCustomAdminController.java index 02e5a7610..048af8d05 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundCustomAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomBackgroundCustomAdminController.java @@ -6,12 +6,14 @@ import com.accompany.admin.vo.RoomBackgroundAdminVo; import com.accompany.common.model.PageReq; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Api(tags = "自定义房间背景审核", value = "房间背景") @RestController diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomManageController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomManageController.java index e2df1a4f9..ff69e8cca 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomManageController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomManageController.java @@ -1,8 +1,8 @@ package com.accompany.admin.controller.room; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.model.Users; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java index b6d6fa9c7..2dec58fce 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java @@ -4,9 +4,9 @@ import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.room.RoomTabAdminService; import com.accompany.admin.vo.roomtab.RoomTabAdminVo; import com.accompany.common.result.BusiResult; +import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; -import com.accompany.common.result.PageResult; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.concurrent.TimeUnit; - @Slf4j @RestController @RequestMapping("/admin/roomTab") diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagAdminController.java index ecb0cf0ff..bf4506534 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTagAdminController.java @@ -8,7 +8,6 @@ import com.accompany.business.model.RoomTag; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.alibaba.fastjson.JSON; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java index 9b5e5bf26..8f314f876 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java @@ -7,9 +7,8 @@ import com.accompany.admin.vo.seekelfin.SeekElfinAdminUserRecordVO; import com.accompany.admin.vo.seekelfin.SeekElfinItemSaveReqParams; import com.accompany.business.util.seekelfin.SeekElfinUtil; import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; import com.accompany.common.result.PageResult; - +import com.accompany.common.status.BusiStatus; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.excel.EasyExcel; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sensitive/SensitiveController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sensitive/SensitiveController.java index c4716df9f..8e6d6025f 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sensitive/SensitiveController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/sensitive/SensitiveController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.sensitive; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.business.model.SensitiveWordNew; import com.accompany.business.mybatismapper.SensitiveWordNewMapper; import com.accompany.business.service.SensitiveService; -import com.accompany.core.service.common.JedisService; -import com.github.pagehelper.PageInfo; import com.accompany.common.redis.RedisKey; +import com.accompany.core.service.common.JedisService; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java index 621e3d195..672112a06 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminDictController.java @@ -1,12 +1,12 @@ package com.accompany.admin.controller.system; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.ErrorCode; import com.accompany.admin.controller.BaseController; import com.accompany.admin.model.AdminDict; import com.accompany.admin.service.system.AdminDictService; -import com.github.pagehelper.PageInfo; import com.accompany.common.utils.BlankUtil; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminMenuController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminMenuController.java index c3fafc050..f79a584e9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminMenuController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminMenuController.java @@ -1,18 +1,18 @@ package com.accompany.admin.controller.system; -import com.accompany.admin.mapper.AdminRefRoleMenuMapper; -import com.accompany.admin.model.AdminRefRoleMenuExample; -import com.accompany.admin.model.AdminRefRoleMenuKey; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.Combobox; import com.accompany.admin.common.ErrorCode; import com.accompany.admin.controller.BaseController; +import com.accompany.admin.mapper.AdminRefRoleMenuMapper; import com.accompany.admin.model.AdminMenu; +import com.accompany.admin.model.AdminRefRoleMenuExample; +import com.accompany.admin.model.AdminRefRoleMenuKey; import com.accompany.admin.service.system.AdminMenuService; import com.accompany.admin.vo.AdminMenuVo; +import com.accompany.common.utils.BlankUtil; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; -import com.accompany.common.utils.BlankUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java index 6a866491e..ee455f783 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminPictureController.java @@ -1,16 +1,13 @@ package com.accompany.admin.controller.system; +import com.accompany.admin.controller.BaseController; +import com.accompany.admin.service.system.AdminPictureService; +import com.accompany.business.model.AdminPicture; +import com.accompany.business.mybatismapper.AdminPictureMapper; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.system.AdminPictureService; -import com.accompany.admin.util.PropertyUtil; -import com.accompany.business.model.AdminPicture; -import com.accompany.business.mybatismapper.AdminPictureMapper; -import com.accompany.business.service.api.QinniuService; import com.github.pagehelper.PageInfo; -import com.accompany.common.utils.BlankUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminRoleController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminRoleController.java index b7ba3bf10..d8ff2688e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminRoleController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminRoleController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.system; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.ErrorCode; import com.accompany.admin.controller.BaseController; import com.accompany.admin.model.AdminRole; import com.accompany.admin.service.system.AdminMenuService; import com.accompany.admin.service.system.AdminRoleService; -import com.github.pagehelper.PageInfo; import com.accompany.common.utils.BlankUtil; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java index 8a26a4128..c56f978f9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java @@ -1,7 +1,5 @@ package com.accompany.admin.controller.system; -import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.ErrorCode; import com.accompany.admin.controller.BaseController; import com.accompany.admin.model.AdminRefUserRoleKey; @@ -16,11 +14,13 @@ import com.accompany.admin.util.ImageType; import com.accompany.admin.vo.AdminMenuVo; import com.accompany.admin.vo.AdminRoleVo; import com.accompany.business.service.api.QinniuService; -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; +import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.StringUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.CollectionUtils; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java index ba488bed3..519c692ea 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java @@ -1,9 +1,5 @@ package com.accompany.admin.controller.system; -import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.accompany.common.utils.GsonUtil; -import com.accompany.core.exception.AdminServiceException; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.system.AdminLogService; @@ -11,12 +7,16 @@ import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.service.system.AppVersionAdminService; import com.accompany.admin.util.AdminUtil; import com.accompany.business.model.AppVersion; -import com.accompany.core.util.StringUtils; import com.accompany.business.vo.EditVersionVo; import com.accompany.business.vo.UploadFileInfoVo; +import com.accompany.common.tencent.cos.TencentCosUploadService; +import com.accompany.common.utils.BlankUtil; +import com.accompany.common.utils.GsonUtil; +import com.accompany.core.exception.AdminServiceException; +import com.accompany.core.util.StringUtils; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; -import com.accompany.common.utils.BlankUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java index d05e2f383..b4d31d735 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/UserLevelCharmFixController.java @@ -4,14 +4,14 @@ package com.accompany.admin.controller.system; import com.accompany.admin.controller.BaseController; import com.accompany.admin.mapper.UserLevelCharmMapper; import com.accompany.admin.model.UserLevelInfo; -import com.accompany.core.model.Users; -import com.accompany.core.model.UsersExample; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.common.JedisService; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.StringUtils; +import com.accompany.core.model.Users; +import com.accompany.core.model.UsersExample; +import com.accompany.core.mybatismapper.UsersMapper; +import com.accompany.core.service.common.JedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolDrawRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolDrawRecordAdminController.java index 4fd5e419a..d3f69e9d8 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolDrawRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolDrawRecordAdminController.java @@ -1,7 +1,6 @@ package com.accompany.admin.controller.treasure; import com.accompany.admin.service.treasure.SeizeTreasurePoolDrawRecordAdminService; -import com.accompany.admin.service.treasure.impl.SeizeTreasurePoolDrawRecordAdminServiceImpl; import com.accompany.admin.vo.treasure.SeizeTreasurePoolDrawRecordAdminVo; import com.accompany.common.model.PageReq; import com.accompany.common.result.PageResult; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolItemAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolItemAdminController.java index c07476f78..87798c1b9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolItemAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePoolItemAdminController.java @@ -15,8 +15,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * @author: liaozetao * @date: 2023/10/10 14:05 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePropAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePropAdminController.java index ef3a6c8bd..4b17f326e 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePropAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/treasure/SeizeTreasurePropAdminController.java @@ -4,8 +4,6 @@ import com.accompany.admin.service.treasure.SeizeTreasurePropAdminService; import com.accompany.business.model.treasure.SeizeTreasureProp; import com.accompany.common.result.BusiResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneBlackAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneBlackAdminController.java index 8b22d790a..eba2b48b0 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneBlackAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/PhoneBlackAdminController.java @@ -13,7 +13,6 @@ package com.accompany.admin.controller.user; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.service.user.PhoneBlackAdminService; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java index 93a7a01ba..bfc720ceb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserCheckAdminController.java @@ -6,14 +6,10 @@ import com.accompany.admin.service.UserCheckAdminService; import com.accompany.admin.vo.UsersAdminVo; import com.accompany.business.model.PrivatePhoto; import com.accompany.business.service.user.PrivatePhotoService; -import com.accompany.business.vo.message.MessageLayout; import com.accompany.common.constant.Constant; -import com.accompany.common.constant.MessageConstant; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.tencent.cos.TencentCosUploadService; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; import com.accompany.core.service.SysConfService; import com.accompany.core.service.account.AccountService; import com.alibaba.fastjson.JSONObject; @@ -21,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.util.Date; import java.util.List; @RestController diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipAdminController.java index f3a6c173b..60ec1d328 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipAdminController.java @@ -12,7 +12,6 @@ package com.accompany.admin.controller.vip; import com.accompany.admin.base.Pagination; import com.accompany.admin.controller.BaseController; -import com.accompany.admin.mapper.AdminRefUserRoleMapper; import com.accompany.admin.model.AdminRole; import com.accompany.admin.params.vip.UpdateVipAdminParams; import com.accompany.admin.service.system.AdminLogService; @@ -23,7 +22,6 @@ import com.accompany.admin.vo.vip.VipInfoAdminVO; import com.accompany.business.model.vip.VipInfo; import com.accompany.business.service.vip.VipTaskService; import com.accompany.business.util.VipUtil; - import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipGiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipGiftAdminController.java index e03953485..d9e7ecf15 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipGiftAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/vip/VipGiftAdminController.java @@ -3,7 +3,6 @@ package com.accompany.admin.controller.vip; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.vip.VipAdminService; import com.accompany.admin.vo.vip.VipGiftAdminVO; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java index c54991f74..bba9014a9 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawApplyAdminController.java @@ -6,14 +6,17 @@ import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.service.withdraw.WithdrawApplyAdminService; import com.accompany.admin.vo.withdraw.WithdrawRecordAdminVo; import com.accompany.common.result.BusiResult; -import com.accompany.core.exception.AdminServiceException; import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.AdminServiceException; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java index bd0fc74d8..e59a726b6 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawBlockAdminController.java @@ -1,17 +1,17 @@ package com.accompany.admin.controller.withdraw; -import com.accompany.core.exception.AdminServiceException; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.AdminConstants; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.system.AdminLogService; import com.accompany.admin.service.withdraw.WithdrawBlockAdminService; import com.accompany.admin.vo.withdraw.WithdrawBlockVo; -import com.github.pagehelper.PageInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.exception.AdminServiceException; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java index b9e9cf128..526cbf5cf 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawConfigAdminController.java @@ -12,7 +12,10 @@ import com.accompany.core.exception.ServiceException; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java index dc4f0cd66..50d5fdd6d 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/withdraw/WithdrawUserRecordAdminController.java @@ -6,7 +6,6 @@ import com.accompany.admin.vo.withdraw.WithdrawUserRecordAdminVo; import com.accompany.common.model.PageReq; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; -import com.accompany.common.status.BusiStatus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldAdminController.java index 81b9a2201..782c86899 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldAdminController.java @@ -6,13 +6,16 @@ import com.accompany.admin.model.AdminUser; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.service.world.WorldAdminService; import com.accompany.admin.vo.WorldAdminVo; -import com.github.pagehelper.PageInfo; -import com.accompany.world.entity.World; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.world.entity.World; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Date; import java.util.HashMap; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldTypeAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldTypeAdminController.java index eb747fcc8..df61284c5 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldTypeAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/WorldTypeAdminController.java @@ -1,16 +1,16 @@ package com.accompany.admin.controller.world; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.WorldTypeSearchDto; import com.accompany.admin.service.world.WorldTypeAdminService; import com.accompany.admin.vo.WorldTypeAdminVo; -import com.accompany.core.exception.ServiceException; -import com.github.pagehelper.PageInfo; -import com.accompany.world.common.WorldException; -import com.accompany.world.entity.WorldType; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; +import com.accompany.world.common.WorldException; +import com.accompany.world.entity.WorldType; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicDataAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicDataAdminController.java index fcbc4106e..45cee2ad0 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicDataAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicDataAdminController.java @@ -1,16 +1,16 @@ package com.accompany.admin.controller.world.community; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.community.DynamicVerifyDto; import com.accompany.admin.service.world.community.DynamicDataAdminService; import com.accompany.admin.service.world.community.DynamicVerifyAdminService; import com.accompany.admin.vo.community.DynamicVerifyVo; -import com.accompany.core.util.StringUtils; -import com.github.pagehelper.PageInfo; import com.accompany.community.constant.DynamicStatusEnum; import com.accompany.community.constant.HotChangeTipEnum; import com.accompany.community.entity.Dynamic; +import com.accompany.core.util.StringUtils; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicStatAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicStatAdminController.java index 82e07e687..2e3baf63c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicStatAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicStatAdminController.java @@ -1,13 +1,13 @@ package com.accompany.admin.controller.world.community; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.community.DynamicStatListDto; import com.accompany.admin.service.world.community.DynamicStatAdminService; -import com.github.pagehelper.PageInfo; -import com.accompany.community.vo.DynamicStatVo; import com.accompany.common.result.BusiResult; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.community.vo.DynamicStatVo; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicVerifyAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicVerifyAdminController.java index 109c1a250..36c0ea0c2 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicVerifyAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/DynamicVerifyAdminController.java @@ -1,16 +1,16 @@ package com.accompany.admin.controller.world.community; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.dto.community.DynamicVerifyDto; import com.accompany.admin.service.world.community.DynamicVerifyAdminService; import com.accompany.admin.vo.community.DynamicVerifyVo; -import com.accompany.core.service.SysConfService; -import com.accompany.core.util.StringUtils; -import com.github.pagehelper.PageInfo; +import com.accompany.common.constant.Constant; import com.accompany.community.constant.DynamicStatusEnum; import com.accompany.community.entity.Dynamic; -import com.accompany.common.constant.Constant; +import com.accompany.core.service.SysConfService; +import com.accompany.core.util.StringUtils; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/RecommendWorldAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/RecommendWorldAdminController.java index 065f69577..9940c6a44 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/RecommendWorldAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/world/community/RecommendWorldAdminController.java @@ -1,16 +1,16 @@ package com.accompany.admin.controller.world.community; -import com.alibaba.fastjson.JSONObject; import com.accompany.admin.controller.BaseController; import com.accompany.admin.service.world.community.RecommendWorldAdminService; import com.accompany.admin.vo.RecommendWorldAdminVo; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.util.StringUtils; -import com.github.pagehelper.PageInfo; -import com.accompany.community.condition.RecommendWorldCondition; -import com.accompany.community.entity.RecommendWorld; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.community.condition.RecommendWorldCondition; +import com.accompany.community.entity.RecommendWorld; +import com.accompany.core.exception.ServiceException; +import com.accompany.core.util.StringUtils; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java index 997aa4a26..228497cdb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java @@ -3,11 +3,11 @@ package com.accompany.admin.interceptor; import com.accompany.admin.common.AdminConstants; import com.accompany.common.utils.IPUtils; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; /** * 日志路径处理拦截器 diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java index 26385a974..2f3816aea 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoginInterceptor.java @@ -3,11 +3,11 @@ package com.accompany.admin.interceptor; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.io.Writer; diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/img/glyphicons-white.svg b/accompany-admin/accompany-admin-web/src/main/resources/static/img/glyphicons-white.svg index a2be78acf..7c52ac7d0 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/static/img/glyphicons-white.svg +++ b/accompany-admin/accompany-admin-web/src/main/resources/static/img/glyphicons-white.svg @@ -1,8 +1,8 @@ - + - + - + - + extends TimeRangeActConfigDto{ diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/dto/RoundRankActConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/dto/RoundRankActConfigDto.java index 16dddc945..f747719be 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/dto/RoundRankActConfigDto.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/dto/RoundRankActConfigDto.java @@ -6,7 +6,10 @@ import com.accompany.core.exception.ServiceException; import lombok.Data; import java.time.LocalDateTime; -import java.util.*; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Optional; @Data public class RoundRankActConfigDto extends RankActConfigDto { diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/vo/ActivityCpItemVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/vo/ActivityCpItemVo.java index 7b36656f1..b55f980bd 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/vo/ActivityCpItemVo.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/common/vo/ActivityCpItemVo.java @@ -1,7 +1,6 @@ package com.accompany.business.common.vo; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java index 12c559347..d46a8cca0 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/exp/vo/ExpBattleActVo.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; import java.util.Map; @Data diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java index 95d80aee0..9a341568f 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/halloween/dto/HalloweenDrawConfigDto.java @@ -1,12 +1,10 @@ package com.accompany.business.halloween.dto; import com.accompany.business.common.dto.MultiLinearDrawActConfigDto; -import com.accompany.business.common.dto.RewardDto; import lombok.Data; import java.time.LocalTime; import java.util.List; -import java.util.Map; @Data public class HalloweenDrawConfigDto extends MultiLinearDrawActConfigDto { diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java index be75304f7..c1d138efa 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/luckyprocessbar/vo/LuckyProcessBarConfigVo.java @@ -1,14 +1,11 @@ package com.accompany.business.luckyprocessbar.vo; -import com.accompany.business.common.vo.ActivityRankItemVo; import com.accompany.business.common.vo.ActivityUserVo; -import com.accompany.business.common.vo.RewardVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; -import java.util.List; import java.util.Map; @ApiModel diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java index 4a382d48b..eac12c8d8 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/dto/QixiXiqueConfigDto.java @@ -3,7 +3,6 @@ package com.accompany.business.qixi.dto; import com.accompany.business.common.dto.TimeRangeActConfigDto; import lombok.Data; -import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java index 9e4074f26..668f1b56d 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-sdk/src/main/java/com/accompany/business/qixi/vo/QixiRedLineConfigVo.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.util.List; @ApiModel diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IActTaskHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IActTaskHandler.java index ace6d3e9f..737358f37 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IActTaskHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IActTaskHandler.java @@ -1,7 +1,6 @@ package com.accompany.business.activity.handle; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; import com.accompany.business.activity.dto.ActTaskContext; import com.accompany.business.activity.enums.ActConditionKindEnum; import com.accompany.business.activity.enums.ActTaskStatusEnum; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java index 71fcaf49b..e9efa1c1c 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/listener/ActTaskListener.java @@ -15,12 +15,12 @@ import com.accompany.mq.model.ActUserTaskMqMessage; import com.accompany.mq.producer.MQMessageProducer; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/AbstractActActivityRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/AbstractActActivityRankService.java index 9e4bdcd4a..508816724 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/AbstractActActivityRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/AbstractActActivityRankService.java @@ -1,7 +1,6 @@ package com.accompany.business.activity.service; import com.accompany.business.service.rank.AbstractRankService; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; /** diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java index 6b44adce7..a762d202f 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualCpRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.event.GiftMessageEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java index d205cb56c..392393e21 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualGiftRankGiftListener.java @@ -11,7 +11,6 @@ import com.accompany.common.utils.DateTimeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java index 0fe1ea68a..3c5b81c23 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualPopularRankGiftListener.java @@ -11,7 +11,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.utils.DateTimeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java index c97f491df..ab294ae9d 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualRoomRankGiftListener.java @@ -8,7 +8,6 @@ import com.accompany.business.model.Hall; import com.accompany.business.service.hall.HallService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; //@Component public class AnnualRoomRankGiftListener extends RoundRankGiftListener implements ApplicationListener { diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java index be5879d37..ed2b59675 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTaskGiftListener.java @@ -10,8 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java index 12a94b5c9..2ee631825 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/listener/AnnualTyrantRankGiftListener.java @@ -5,7 +5,6 @@ import com.accompany.business.base.listener.RankGiftListener; import com.accompany.business.event.GiftMessageEvent; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; //@Component public class AnnualTyrantRankGiftListener extends RankGiftListener implements ApplicationListener { diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java index dff85f6ef..4a15ae8f7 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpRankService.java @@ -3,10 +3,9 @@ package com.accompany.business.annual.service; import com.accompany.business.annual.AnnualCpDao; import com.accompany.business.annual.constant.AnnualConstant; import com.accompany.business.base.service.BaseCpRankActService; -import com.accompany.business.christmas.constant.ChristmasConstant; -import com.accompany.business.common.dto.CpRankActCpProp; import com.accompany.business.common.constant.CpRankTypeEnum; import com.accompany.business.common.dto.CpRankActConfigDto; +import com.accompany.business.common.dto.CpRankActCpProp; import com.accompany.business.common.vo.ActivityCpRankVo; import com.accompany.business.common.vo.RewardVo; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java index f12406f73..a3ef9f1a0 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualCpUsersRankObjectProvider.java @@ -3,7 +3,6 @@ package com.accompany.business.annual.service; import com.accompany.business.annual.AnnualCpDao; import com.accompany.business.base.rankobj.CpRankObject; import com.accompany.business.base.rankobj.CpRankObjectProvider; -import com.accompany.business.christmas.ChristmasCpDao; import com.accompany.business.common.dto.CpRankActCpProp; import com.accompany.business.service.user.UsersService; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java index 775d1ee59..31cd58b19 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualGiftRankService.java @@ -8,9 +8,6 @@ import com.accompany.business.base.service.BaseMultiRankActService; import com.accompany.business.common.dto.MultiRankActConfigDto; import com.accompany.business.common.dto.RankActConfigDto; import com.accompany.business.common.vo.ActivityRankVo; -import com.accompany.business.model.Hall; -import com.accompany.business.model.HallMember; -import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java index 6cd623899..de4b4c4fd 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularHourRankService.java @@ -6,10 +6,10 @@ import com.accompany.business.annual.vo.AnnualPopularHourRankVo; import com.accompany.business.common.dto.RoundRankActConfigDto; import com.accompany.business.common.vo.ActivityUserVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.room.UserInOutRoomRecordService; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.constant.AppEnum; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java index 876d879f9..3a4b8db76 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualPopularRankService.java @@ -9,11 +9,9 @@ import com.accompany.business.base.service.BaseRoundRankActService; import com.accompany.business.common.constant.RankRoundEnum; import com.accompany.business.common.dto.RoundRankActConfigDto; import com.accompany.business.common.vo.ActivityRankItemVo; -import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.common.vo.ActivityUserVo; import com.accompany.business.common.vo.RoundActivityRankVo; import com.accompany.business.service.room.UserInOutRoomRecordService; -import com.accompany.business.service.user.UserInRoomService; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; @@ -28,7 +26,10 @@ import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java index 231e0c2ba..6a738ce08 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTaskService.java @@ -8,8 +8,8 @@ import com.accompany.business.common.constant.RankTypeEnum; import com.accompany.business.common.dto.RewardDto; import com.accompany.business.common.vo.ActivityStageTaskItemVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java index e54cb307c..4662ef634 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/annual/service/AnnualTyrantRankService.java @@ -7,9 +7,7 @@ import com.accompany.business.common.constant.RankTypeEnum; import com.accompany.business.common.dto.RankActConfigDto; import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.model.Hall; -import com.accompany.business.service.hall.HallService; import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; import com.alibaba.fastjson.JSON; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseCpRankActService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseCpRankActService.java index 3abdf2bab..eed3866b3 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseCpRankActService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseCpRankActService.java @@ -5,7 +5,9 @@ import com.accompany.business.base.rankobj.CpRankObjectProvider; import com.accompany.business.common.constant.CpRankTypeEnum; import com.accompany.business.common.dto.CpRankActConfigDto; import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.common.vo.*; +import com.accompany.business.common.vo.ActivityCpRankItemVo; +import com.accompany.business.common.vo.ActivityCpRankVo; +import com.accompany.business.common.vo.RewardVo; import com.accompany.business.util.RewardUtil; import com.accompany.common.constant.AppEnum; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseMultiRankActService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseMultiRankActService.java index cde6f6e0d..ec50c78ef 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseMultiRankActService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseMultiRankActService.java @@ -10,9 +10,9 @@ import com.accompany.business.common.vo.ActivityMultiRankVo; import com.accompany.business.common.vo.ActivityRankItemVo; import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.model.HallMember; import com.accompany.business.service.hall.HallService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseRankActService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseRankActService.java index 78f02b99d..b3d8facea 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseRankActService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/base/service/BaseRankActService.java @@ -10,10 +10,10 @@ import com.accompany.business.common.vo.ActivityDateRankVo; import com.accompany.business.common.vo.ActivityRankItemVo; import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.hall.HallService; import com.accompany.business.service.rank.IRank; import com.accompany.business.service.rank.RankServiceFactory; +import com.accompany.business.util.RewardUtil; import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Constant; import com.accompany.common.enums.RedisZSetEnum; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java index 416c7fb67..2c30554bb 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.event.GiftMessageEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java index 18d7485dd..1a620dd4d 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasCpRewardGiftListener.java @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java index 1e064240d..b82ab7280 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasLetterTaskGiftListener.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java index 51af24a28..6042255a1 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/listener/ChristmasRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.event.GiftMessageEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java index c34cf1189..a8fa7ea06 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/christmas/service/ChristmasCpService.java @@ -10,8 +10,8 @@ import com.accompany.business.common.dto.CpRankActConfigDto; import com.accompany.business.common.dto.RewardDto; import com.accompany.business.common.vo.ActivityStageTaskItemVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java index ba82073b1..21b05599c 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/listener/SingleCrossRoomPkActListener.java @@ -24,7 +24,6 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Collections; import java.util.Date; /** diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java index cf843cb59..506e42033 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/crossroompk/service/SingleCrossRoomPkTaskService.java @@ -1,9 +1,9 @@ package com.accompany.business.crossroompk.service; import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.util.RewardUtil; import com.accompany.business.crossroompk.constant.CrossRoomPkConstant; import com.accompany.business.crossroompk.dto.CrossRoomPkActConfigDto; +import com.accompany.business.util.RewardUtil; import com.accompany.common.enums.RedisZSetEnum; import com.accompany.common.redis.RedisKey; import com.accompany.core.service.SysConfService; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java index d1cb242f5..ec5380c2c 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.event.GiftMessageEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java index d20aeb6fd..1116b8cb0 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/listener/DoubleElevenTaskGiftListener.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java index b4da7111e..10ad07902 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/doubleeleven/service/DoubleElevenTaskService.java @@ -1,19 +1,12 @@ package com.accompany.business.doubleeleven.service; import com.accompany.business.base.service.BaseRewardTaskActService; -import com.accompany.business.base.service.BaseTicketTaskActService; import com.accompany.business.common.dto.RewardTaskActConfigDto; -import com.accompany.business.common.dto.TaskActConfigDto; import com.accompany.business.common.vo.RewardVo; import com.accompany.business.doubleeleven.DoubleElevenTaskDao; import com.accompany.business.doubleeleven.constant.DoubleElevenConstant; import com.accompany.business.doubleeleven.dto.DoubleElevenTaskConfigDto; import com.accompany.business.doubleeleven.vo.DoubleElevenTaskConfigVo; -import com.accompany.business.halloween.HalloweenCandyNumDao; -import com.accompany.business.halloween.HalloweenTicketTaskDao; -import com.accompany.business.halloween.constant.HalloweenConstant; -import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; -import com.accompany.business.halloween.vo.HalloweenTaskConfigVo; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java index bd05e351b..f78c8981f 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/listener/ExpBattleRankGiftListener.java @@ -1,6 +1,5 @@ package com.accompany.business.exp.listener; -import com.accompany.business.common.dto.RankActConfigDto; import com.accompany.business.event.GiftMessageEvent; import com.accompany.business.exp.dto.ExpBattleActConfigDto; import com.accompany.business.exp.service.ExpBattleActService; @@ -15,7 +14,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java index 18a2d0a08..95ffd5213 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/exp/service/ExpBattleRankService.java @@ -16,13 +16,10 @@ import com.accompany.business.util.VipUtil; import com.accompany.business.vo.message.MessageTemplate; import com.accompany.common.config.SystemConfig; import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.DoubleUtil; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.vo.vip.VipBaseInfoVO; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java index dff8fa85a..d1f6d3036 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayRoomHandler.java @@ -32,7 +32,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Date; +import java.util.List; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java index 51e54b9e1..871fd43d2 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java @@ -12,7 +12,6 @@ import com.accompany.business.activity.service.ActUserTaskService; import com.accompany.business.fools.vo.AprilFoolsDayRoomVo; import com.accompany.business.service.redenvelope.RedEnvelopeRainService; import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UserInRoomService; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java index fa49ae1e7..ab83e85eb 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/task/AprilFoolsDayBoxTaskService.java @@ -14,10 +14,10 @@ import com.accompany.core.service.user.UsersBaseService; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java index 9e714c649..c3f8464da 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenDrawBoxGiftListener.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java index 8a15e312c..f0ca2d107 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.halloween.service.HalloweenRankService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java index 09cf998bf..a7fc9e9d7 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.halloween.service.HalloweenTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java index 653077e2d..0291ec41a 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/halloween/listener/HalloweenTaskLuckySeaListener.java @@ -2,14 +2,10 @@ package com.accompany.business.halloween.listener; import com.accompany.business.common.dto.TaskActConfigDto; import com.accompany.business.event.LuckySeaDrawMessageEvent; -import com.accompany.business.event.room.UserOutRoomEvent; import com.accompany.business.halloween.constant.HalloweenConstant; import com.accompany.business.halloween.dto.HalloweenTaskConfigDto; import com.accompany.business.halloween.service.HalloweenTaskService; -import com.accompany.business.message.FindLoveDrawMessage; import com.accompany.business.message.LuckySeaDrawMessage; -import com.accompany.business.message.room.UserOutRoomMessage; -import com.accompany.business.midautumn.constant.MidAutumnConstant; import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; import com.accompany.common.utils.DateTimeUtil; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java index bba94e2ad..1f8cebd2b 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/listener/LuckyProcessBarGiftListener.java @@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java index 7d179040e..4d79240ec 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/luckyprocessbar/service/LuckyProcessBarService.java @@ -5,9 +5,9 @@ import com.accompany.business.common.vo.ActivityUserVo; import com.accompany.business.luckyprocessbar.constant.LuckyProcessBarConstant; import com.accompany.business.luckyprocessbar.dto.LuckyProcessBarConfigDto; import com.accompany.business.luckyprocessbar.vo.LuckyProcessBarConfigVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.AppEnum; import com.accompany.common.status.BusiStatus; @@ -27,7 +27,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.*; +import java.util.Collections; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java index 4f0ed624c..497036985 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnJackpotFindLoveDrawListener.java @@ -1,9 +1,7 @@ package com.accompany.business.midautumn.listener; import com.accompany.business.event.FindLoveDrawMessageEvent; -import com.accompany.business.event.LuckyBagMessageEvent; import com.accompany.business.message.FindLoveDrawMessage; -import com.accompany.business.message.LuckyBagMessage; import com.accompany.business.midautumn.service.MidAutumnJackpotService; import com.accompany.common.utils.DateTimeUtil; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java index c9f28bb8f..b879a9d86 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnRankGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.midautumn.service.MidAutumnRankService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java index 4ddcd75ec..eb6f07a70 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskFindLoveDrawListener.java @@ -4,7 +4,6 @@ import com.accompany.business.event.FindLoveDrawMessageEvent; import com.accompany.business.message.FindLoveDrawMessage; import com.accompany.business.midautumn.constant.MidAutumnConstant; import com.accompany.business.midautumn.dto.MidAutumnTaskConfigDto; -import com.accompany.business.midautumn.service.MidAutumnJackpotService; import com.accompany.business.midautumn.service.MidAutumnTaskService; import com.accompany.common.utils.DateTimeUtil; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java index c49b5ad3b..5b0ffc497 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/listener/MidAutumnTaskGiftListener.java @@ -6,7 +6,6 @@ import com.accompany.business.midautumn.service.MidAutumnTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; @Slf4j //@Component diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java index 1ddc26fda..a72ebb2f3 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/midautumn/service/MidAutumnJackpotCalculateService.java @@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java index 6e2a7832d..6801ec75b 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRankGiftListener.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java index 96e2c4cce..9aa4d32ca 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiRoomRankGiftListener.java @@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java index 1dbeb35c9..e7fc2256f 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/listener/QixiXiqueGiftListener.java @@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java index c37b19e32..dd4117bab 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRankService.java @@ -5,7 +5,6 @@ import com.accompany.business.common.vo.ActivityDateRankVo; import com.accompany.business.common.vo.ActivityRankItemVo; import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.mapper.QixiRankDao; import com.accompany.business.model.Hall; import com.accompany.business.qixi.constant.QixiConstant; @@ -15,6 +14,7 @@ import com.accompany.business.qixi.model.QixiRankHourCp; import com.accompany.business.qixi.vo.QixiRankHourCpVo; import com.accompany.business.service.hall.HallService; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.base.SpringContextHolder; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java index 5ac12d261..35487e48c 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiRedLineDrawService.java @@ -3,9 +3,9 @@ package com.accompany.business.qixi.service; import com.accompany.business.common.dto.RewardDto; import com.accompany.business.common.dto.RewardDtoLinearConfig; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.qixi.constant.QixiConstant; import com.accompany.business.qixi.dto.QixiRedLineConfigDto; +import com.accompany.business.util.RewardUtil; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java index ba7b79330..46e9bb1d1 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/qixi/service/QixiXiqueService.java @@ -1,13 +1,13 @@ package com.accompany.business.qixi.service; import com.accompany.business.common.constant.RewardTypeEnum; -import com.accompany.business.util.RewardUtil; import com.accompany.business.qixi.QixiXiqueNumDao; import com.accompany.business.qixi.QixiXiqueTaskDao; import com.accompany.business.qixi.constant.QixiConstant; import com.accompany.business.qixi.dto.QixiXiqueConfigDto; import com.accompany.business.qixi.event.QixiXiqueAddEvent; import com.accompany.business.qixi.vo.QixiXiqueConfigVo; +import com.accompany.business.util.RewardUtil; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java index 1b69309ab..01284f923 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java @@ -9,12 +9,9 @@ import com.accompany.business.activity.model.*; import com.accompany.business.activity.service.*; import com.accompany.business.activity.strategy.ActRewardFactory; import com.accompany.business.activity.vo.ActivityReward; -import com.accompany.business.mapper.ActTaskDao; import com.accompany.business.signin.handler.RepairSignInHandler; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.base.UidContextHolder; -import com.accompany.core.enums.TaskStatusEnum; -import com.accompany.core.exception.ServiceException; import com.accompany.mq.constant.MqConstant; import com.accompany.mq.model.ActTaskRewardMqMessage; import com.accompany.mq.producer.MQMessageProducer; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java index 57864c0a9..363794294 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/listener/SnookerRankMiniGameListener.java @@ -1,7 +1,6 @@ package com.accompany.business.snooker.listener; import com.accompany.business.common.constant.RankRoundEnum; -import com.accompany.business.common.dto.RoundRankActConfigDto; import com.accompany.business.dto.miniGame.GameEndDto; import com.accompany.business.dto.miniGame.PlayerResultDto; import com.accompany.business.event.MiniGameSettlementEvent; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java index 53002028f..a4f5b36d3 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/snooker/service/SnookerRankService.java @@ -4,7 +4,6 @@ import com.accompany.business.base.rankobj.UsersRankObjectProvider; import com.accompany.business.base.service.BaseRoundRankActService; import com.accompany.business.common.constant.RankRoundEnum; import com.accompany.business.common.dto.RoundRankActConfigDto; - import com.accompany.business.snooker.constant.SnookerActConstant; import com.accompany.business.snooker.dto.SnookerActConfigDto; import com.accompany.common.constant.AppEnum; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java index f109a89fc..c0d688488 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/listener/ValentinesCpRankGiftListener.java @@ -4,7 +4,6 @@ import com.accompany.business.common.dto.CpRankActConfigDto; import com.accompany.business.event.GiftMessageEvent; import com.accompany.business.message.GiftMessage; import com.accompany.business.model.Hall; -import com.accompany.business.model.clan.Clan; import com.accompany.business.service.clan.ClanService; import com.accompany.business.service.give.GiveUserService; import com.accompany.business.service.hall.HallService; @@ -17,7 +16,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.util.Date; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java index 6a07940bb..fa5e3194d 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/valentine/service/ValentinesCpRankService.java @@ -9,10 +9,10 @@ import com.accompany.business.common.dto.RewardDto; import com.accompany.business.common.vo.ActivityCpRankVo; import com.accompany.business.common.vo.ActivityStageTaskItemVo; import com.accompany.business.common.vo.RewardVo; -import com.accompany.business.util.RewardUtil; import com.accompany.business.service.dress.UserChatBubbleService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.user.UsersService; +import com.accompany.business.util.RewardUtil; import com.accompany.business.valentine.ValentinesCpDao; import com.accompany.business.valentine.constant.ValentinesConstant; import com.accompany.business.valentine.vo.ValentinesCpRankVo; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java index 56a05ed76..fb5f72a90 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualCpRankController.java @@ -1,12 +1,7 @@ package com.accompany.business.annual; import com.accompany.business.annual.service.AnnualCpRankService; -import com.accompany.business.christmas.service.ChristmasCpRankService; -import com.accompany.business.christmas.service.ChristmasCpService; -import com.accompany.business.christmas.vo.ChristmasCpVo; -import com.accompany.business.common.constant.CpRankTypeEnum; import com.accompany.business.common.vo.ActivityCpRankVo; -import com.accompany.business.common.vo.RewardVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.result.BusiResult; @@ -27,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.Date; -import java.util.List; @Api(tags = "2023年度盛典活动",value = "2023年度盛典活动") @RequestMapping("/act/2023Annual/cpRank") diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java index 0073ef3b1..d39fc1299 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/annual/AnnualGiftRankController.java @@ -2,7 +2,6 @@ package com.accompany.business.annual; import com.accompany.business.annual.constant.AnnualGiftRankTypeEnum; import com.accompany.business.annual.service.AnnualGiftRankService; -import com.accompany.business.annual.service.AnnualTyrantRankService; import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.ApplicationConstant; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/benefits/RechargeBenefitsActController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/benefits/RechargeBenefitsActController.java index 38e9bc8a7..525f8eb64 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/benefits/RechargeBenefitsActController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/benefits/RechargeBenefitsActController.java @@ -4,10 +4,10 @@ import com.accompany.business.benefits.vo.RechargeBenefitsActVo; import com.accompany.business.benefits.vo.RechargeBenefitsRewardRecordVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; +import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; -import com.accompany.common.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import jodd.util.StringUtil; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java index 29cfd2f9b..5bc0c547a 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/children/ChildrenDayController.java @@ -5,8 +5,6 @@ import com.accompany.business.children.service.ChildrenDayTaskService; import com.accompany.business.children.vo.ChildrenDayTaskVo; import com.accompany.business.children.vo.ChildrenDrawRewardVo; import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.google.common.util.concurrent.RateLimiter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -14,8 +12,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.concurrent.TimeUnit; - /** * @author: liaozetao * @date: 2024/5/23 09:52 diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java index 34d1fbc3a..47ef91052 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/exp/ExpBattleActController.java @@ -15,7 +15,10 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java index b08f6220e..2cfe8e37e 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-web/src/main/java/com/accompany/business/luckyprocessbar/LuckyProcessBarController.java @@ -1,6 +1,5 @@ package com.accompany.business.luckyprocessbar; -import com.accompany.business.common.vo.ActivityRankVo; import com.accompany.business.luckyprocessbar.service.LuckyProcessBarService; import com.accompany.business.luckyprocessbar.vo.LuckyProcessBarConfigVo; import com.accompany.common.annotation.Authorization; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java index 34b1be105..12e84e5a9 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/activities/ActivitesPackTypeEnum.java @@ -1,7 +1,6 @@ package com.accompany.business.constant.activities; import com.accompany.common.status.BusiStatus; -import com.accompany.core.enumeration.BillTypeEnum; import com.accompany.core.exception.ServiceException; import java.util.Arrays; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountFieldEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountFieldEnum.java index fff041261..ef3aa3109 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountFieldEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountFieldEnum.java @@ -5,9 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.math.BigDecimal; -import java.util.List; - @Getter @AllArgsConstructor @NoArgsConstructor diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java index a6c54ef6e..be78589d8 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/guild/GuildWithdrawAccountTypeEnum.java @@ -4,7 +4,6 @@ import com.accompany.business.constant.CountryEnum; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import org.apache.poi.ss.formula.functions.Count; import java.math.BigDecimal; import java.util.List; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGameForNavConfigDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGameForNavConfigDto.java index 2a0403e07..5ddac2b17 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGameForNavConfigDto.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGameForNavConfigDto.java @@ -4,7 +4,6 @@ import lombok.Data; import java.util.HashMap; import java.util.Map; -import java.util.Set; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGamePlayerResultDto.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGamePlayerResultDto.java index de7011cda..cfc3eb624 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGamePlayerResultDto.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/miniGame/MiniGamePlayerResultDto.java @@ -1,6 +1,5 @@ package com.accompany.business.dto.miniGame; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RoomTagExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RoomTagExample.java index 16765989f..32344b6ed 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RoomTagExample.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RoomTagExample.java @@ -1,7 +1,5 @@ package com.accompany.business.model; -import com.accompany.core.model.UsersExample; - import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guild/SsMonthCoinRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guild/SsMonthCoinRecord.java index 68b4fa685..ced81add1 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guild/SsMonthCoinRecord.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guild/SsMonthCoinRecord.java @@ -1,12 +1,13 @@ package com.accompany.business.model.guild; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * SS金币发放明细表实体类 * diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/skillcard/SkillCardUserRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/skillcard/SkillCardUserRecord.java index ece26effc..300f20b75 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/skillcard/SkillCardUserRecord.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/skillcard/SkillCardUserRecord.java @@ -7,7 +7,6 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.List; @Data @TableName("skill_card_user_record") diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java index 4d78013c4..43309ec0a 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/BasePageParams.java @@ -1,7 +1,6 @@ package com.accompany.business.param; -import com.accompany.core.enumeration.PartitionEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/MicQueueParam.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/MicQueueParam.java index 124d6b9dc..fd9c00234 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/MicQueueParam.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/param/MicQueueParam.java @@ -1,7 +1,5 @@ package com.accompany.business.param; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; import lombok.*; import org.json.JSONObject; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomVo.java index 8f5beefeb..bdca23f5b 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomVo.java @@ -6,7 +6,6 @@ import com.accompany.business.vo.treasure.SeizeTreasureSwitchConfig; import com.accompany.common.annotation.ReplaceAppDomain; import com.accompany.core.annotation.I18n; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5ChargeRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5ChargeRankVo.java index 56c2178be..3e45dbcbb 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5ChargeRankVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5ChargeRankVo.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; -import java.util.Date; import java.util.List; @Data diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5CpRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5CpRankVo.java index f906f35d6..269463463 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5CpRankVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5CpRankVo.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; import java.util.List; @Data diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5LevelAwardVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5LevelAwardVo.java index 2f30969ee..fef475684 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5LevelAwardVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5LevelAwardVo.java @@ -3,8 +3,6 @@ package com.accompany.business.vo.activity.h5; import com.accompany.business.model.activity.h5.ActivityH5LevelAward; import lombok.Data; -import java.util.Date; - @Data public class ActivityH5LevelAwardVo extends ActivityH5LevelAward { private String name; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5UserVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5UserVo.java index 58ebaf520..2fb18c2b4 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5UserVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityH5UserVo.java @@ -5,8 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; - @Data @Builder @AllArgsConstructor diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityOfDayConsumeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityOfDayConsumeVo.java index 62119bbc9..ad5e6c9d0 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityOfDayConsumeVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/h5/ActivityOfDayConsumeVo.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; import java.util.List; @Data diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/weekstar/WeekStarParentVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/weekstar/WeekStarParentVo.java index aedabceb6..e0ccf2a43 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/weekstar/WeekStarParentVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/activity/weekstar/WeekStarParentVo.java @@ -3,8 +3,6 @@ package com.accompany.business.vo.activity.weekstar; import io.swagger.annotations.ApiModel; import lombok.Data; -import java.util.List; - /** * @author yangming * @since 2020-05-28 diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyIncomeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyIncomeVo.java index 8ad3ddb57..468700e32 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyIncomeVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyIncomeVo.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.ArrayList; import java.util.List; @ApiModel diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberDailyIncomeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberDailyIncomeVo.java index 9888e4d99..cee2dec6a 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberDailyIncomeVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberDailyIncomeVo.java @@ -1,6 +1,5 @@ package com.accompany.business.vo.family; -import com.accompany.business.vo.guild.CycleDateVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberIncomeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberIncomeVo.java index 9ba501280..00302e716 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberIncomeVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyMemberIncomeVo.java @@ -1,6 +1,5 @@ package com.accompany.business.vo.family; -import com.accompany.business.vo.guild.CycleDateVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyVo.java index 6e04ce658..5bdabdfef 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/family/FamilyVo.java @@ -3,7 +3,6 @@ package com.accompany.business.vo.family; import com.accompany.business.model.family.FamilyPayAccount; import com.accompany.business.vo.SimpleUserVo; import com.accompany.common.annotation.ReplaceAppDomain; -import com.accompany.core.vo.UserLevelVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java index 862c95a57..51f0193d9 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AgencyWithdrawExamineVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; /** *

diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberUsdOperateTabVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberUsdOperateTabVo.java index 3b65e44ce..449079b24 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberUsdOperateTabVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberUsdOperateTabVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @ApiModel diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSSRankVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSSRankVo.java index 0e0ebeaad..913bdd5e5 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSSRankVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSSRankVo.java @@ -1,7 +1,6 @@ package com.accompany.business.vo.guild; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSkipVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSkipVo.java index 461ada88f..3c3b0940b 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSkipVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildSkipVo.java @@ -1,9 +1,7 @@ package com.accompany.business.vo.guild; import com.accompany.business.vo.family.FamilySkipVo; -import com.accompany.common.annotation.ReplaceAppDomain; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @ApiModel diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/HomeRoomVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/HomeRoomVo.java new file mode 100644 index 000000000..8235b1cf6 --- /dev/null +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/HomeRoomVo.java @@ -0,0 +1,37 @@ +package com.accompany.business.vo.home; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author: yangming + * @Date: 2020/4/21 22:23 + * @Description: 首页开黑房间数据 + **/ +@Data +@ApiModel +public class HomeRoomVo extends PlayRoomVo { + + private int homeRoomType = 0; + private BigDecimal hotValue = BigDecimal.ZERO; + private int hourTop = 0; + + /** + * 是否为周榜top1 + */ + @ApiModelProperty("是否为周榜top1") + private Integer isWeekTop1 = 0; + + /** + * 是否为小时榜top1 + */ + @ApiModelProperty("是否为小时榜top1") + private Integer isHourTop1 = 0; + + private boolean roomBoom; + private String roomBoomPic; + private String roomBoomVapUrl; +} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/PlayRoomVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/PlayRoomVo.java index 6319ad4b8..0fc2f6817 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/PlayRoomVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/PlayRoomVo.java @@ -87,19 +87,4 @@ public class PlayRoomVo extends SimplePlayRoomVo { @ApiModelProperty(value = "开黑广播时间") private Date broadCreateTime; - /** - * 是否为周榜top1 - */ - @ApiModelProperty("是否为周榜top1") - private Integer isWeekTop1 = 0; - - /** - * 是否为小时榜top1 - */ - @ApiModelProperty("是否为小时榜top1") - private Integer isHourTop1 = 0; - - private boolean roomBoom; - private String roomBoomPic; - private String roomBoomVapUrl; } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/SimplePlayRoomVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/SimplePlayRoomVo.java index dfdbdb1a5..e24a08f93 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/SimplePlayRoomVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/home/SimplePlayRoomVo.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java index a4d3c7fca..5dd7fbac2 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/message/MessageLayout.java @@ -1,12 +1,10 @@ package com.accompany.business.vo.message; import org.apache.commons.lang3.SerializationUtils; -import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class MessageLayout implements Serializable { diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/miniGame/MiniGameVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/miniGame/MiniGameVo.java index c2995c97f..bf6f4cf99 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/miniGame/MiniGameVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/miniGame/MiniGameVo.java @@ -1,11 +1,9 @@ package com.accompany.business.vo.miniGame; -import com.accompany.business.dto.miniGame.GameModeDto; import com.accompany.business.model.miniGame.MiniGame; import lombok.Data; import java.util.List; -import java.util.Map; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/roomtab/RoomTabHomeVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/roomtab/RoomTabHomeVo.java index 0d28a5c51..d57a34794 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/roomtab/RoomTabHomeVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/roomtab/RoomTabHomeVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -40,7 +41,10 @@ public class RoomTabHomeVo implements Serializable { private Boolean isShow; private Boolean isHourTop1; - private Boolean isWeekTop1; + //private Boolean isWeekTop1; + + private int hourTop; private Boolean crossPking; + private BigDecimal hotValue; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java index 1c405f3ca..7c3af2423 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java @@ -8,7 +8,6 @@ import com.accompany.core.base.SpringContextHolder; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,6 +16,7 @@ import org.springframework.core.task.TaskDecorator; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; +import javax.validation.constraints.NotNull; import java.util.concurrent.Executor; import java.util.concurrent.ThreadPoolExecutor; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/AnchorFansSendGiftListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/AnchorFansSendGiftListener.java index 066d04976..f4b7bd861 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/AnchorFansSendGiftListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/AnchorFansSendGiftListener.java @@ -3,7 +3,6 @@ package com.accompany.business.event.listener; import cn.hutool.core.util.StrUtil; import com.accompany.business.constant.nameplate.NameplateStyleTypeEnum; import com.accompany.business.event.AnchorFansSendGiftEvent; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.anchor.*; import com.accompany.business.service.anchor.*; import com.accompany.business.service.nameplate.UserNameplateService; @@ -18,6 +17,7 @@ import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.user.UserNameplateVo; +import com.accompany.sharding.model.GiftSendRecord; import com.google.gson.Gson; import lombok.SneakyThrows; import org.slf4j.Logger; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/CustomerConversationListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/CustomerConversationListener.java index c20ae8337..80bbb5934 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/CustomerConversationListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/CustomerConversationListener.java @@ -6,15 +6,12 @@ import com.accompany.business.event.CustomerConversationEvent; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; import com.accompany.common.config.SystemConfig; -import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.EnvComponent; import com.accompany.common.utils.StringUtils; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.service.user.UsersBaseService; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/FamilyMemberWeekLevelRewardGoldListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/FamilyMemberWeekLevelRewardGoldListener.java index 0fe58ca5e..bdd1ca3e2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/FamilyMemberWeekLevelRewardGoldListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/FamilyMemberWeekLevelRewardGoldListener.java @@ -1,9 +1,7 @@ package com.accompany.business.event.listener; import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.event.SuperLuckyGiftDiamondIncomeMessageEvent; import com.accompany.business.message.GiftMessage; -import com.accompany.business.message.SuperLuckyGiftDiamondIncomeMessage; import com.accompany.business.model.family.FamilyMember; import com.accompany.business.service.family.FamilyMemberService; import com.accompany.business.service.family.FamilyMemberWeekLevelRewardService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java index a45de1511..8e4938fd2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftNotifyListener.java @@ -23,7 +23,6 @@ import com.accompany.common.constant.GiftConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.StringUtils; import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSONObject; @@ -35,7 +34,6 @@ import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import java.util.Arrays; import java.util.List; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftWarningListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftWarningListener.java index ae8e9380c..aa65fe089 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftWarningListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GiftWarningListener.java @@ -3,7 +3,6 @@ package com.accompany.business.event.listener; import com.accompany.business.dto.SendGiftWarningDto; import com.accompany.business.event.GiftMessageEvent; import com.accompany.business.message.GiftMessage; -import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.business.service.user.UsersService; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; @@ -12,6 +11,7 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.message.MessageRobotPushService; +import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GuildMemberWeekLevelRewardDiamondListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GuildMemberWeekLevelRewardDiamondListener.java index bccf70029..5e8095d18 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GuildMemberWeekLevelRewardDiamondListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/GuildMemberWeekLevelRewardDiamondListener.java @@ -8,7 +8,6 @@ import com.accompany.business.service.guild.GuildMemberWeekLevelRewardService; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/RankListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/RankListener.java index 4eac8b094..154f2731a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/RankListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/RankListener.java @@ -19,7 +19,6 @@ import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import java.util.Calendar; import java.util.Date; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/box/OpenBoxRankListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/box/OpenBoxRankListener.java index ee78baca5..f0723093e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/box/OpenBoxRankListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/box/OpenBoxRankListener.java @@ -1,8 +1,8 @@ package com.accompany.business.event.listener.box; import com.accompany.business.event.box.BoxPrizeEvent; -import com.accompany.business.message.PrizeEntity; import com.accompany.business.message.BoxPrizeMessage; +import com.accompany.business.message.PrizeEntity; import com.accompany.business.service.box.OpenBoxRankService; import com.accompany.business.service.user.UsersService; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForAccumulateListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForAccumulateListener.java index 6929c44f6..e3dbc5709 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForAccumulateListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForAccumulateListener.java @@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; import java.util.Date; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java index e16b56d7d..969ec803b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java @@ -9,7 +9,6 @@ import com.accompany.business.message.GiftMessage; import com.accompany.business.model.lucky.LuckyBagCollect; import com.accompany.business.model.lucky.LuckyBagCollectRecord; import com.accompany.business.model.lucky.LuckyBagCollectRewardRecord; -import com.accompany.business.model.lucky.LuckyBagFortunateRecord; import com.accompany.business.service.lucky.LuckyBagCollectRecordService; import com.accompany.business.service.lucky.LuckyBagCollectRewardRecordService; import com.accompany.business.service.lucky.LuckyBagCollectService; @@ -23,9 +22,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java index b6d389f6c..da0b65fe0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java @@ -5,17 +5,17 @@ import cn.hutool.core.util.StrUtil; import com.accompany.business.constant.PrizeTypeEnum; import com.accompany.business.enums.message.ContentTypeEnum; import com.accompany.business.event.GiftMessageEvent; -import com.accompany.business.message.PrizeEntity; import com.accompany.business.message.GiftMessage; +import com.accompany.business.message.PrizeEntity; import com.accompany.business.model.Gift; import com.accompany.business.model.lucky.LuckyBagFortunate; import com.accompany.business.model.lucky.LuckyBagFortunateRecord; import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.prize.PrizeContext; -import com.accompany.business.service.prize.PrizeStrategyFactory; import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.lucky.LuckyBagFortunateRecordService; import com.accompany.business.service.lucky.LuckyBagFortunateService; +import com.accompany.business.service.prize.PrizeContext; +import com.accompany.business.service.prize.PrizeStrategyFactory; import com.accompany.business.vo.message.BaseSpan; import com.accompany.business.vo.message.MessageTemplate; import com.accompany.business.vo.message.TextSpan; @@ -32,9 +32,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/room/UserInRoomAutoChatListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/room/UserInRoomAutoChatListener.java index eea0f1bcd..63d367f41 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/room/UserInRoomAutoChatListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/room/UserInRoomAutoChatListener.java @@ -5,7 +5,6 @@ import com.accompany.business.dto.UserInToRoomAutoChatConfigDTO; import com.accompany.business.event.room.UserInRoomEvent; import com.accompany.business.message.room.UserInRoomMessage; import com.accompany.business.model.room.PrivateChatItem; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.nameplate.UserNameplateService; import com.accompany.business.service.room.PrivateChatItemService; import com.accompany.business.service.room.QueryRoomService; @@ -13,6 +12,7 @@ import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.VipUtil; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.RandomUtil; import com.accompany.common.utils.StringUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityAwardMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityAwardMapper.java index e12bcc0f7..2a2198f74 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityAwardMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityAwardMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ActivityAward; import com.accompany.business.model.ActivityAwardExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ActivityAwardMapper { int countByExample(ActivityAwardExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java index 9a659b9ff..358c10167 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityConfigMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ActivityConfig; import com.accompany.business.model.ActivityConfigExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ActivityConfigMapper { int countByExample(ActivityConfigExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackItemMapper.java index 69107b39d..ca87744f4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackItemMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackItemMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ActivityPackItem; import com.accompany.business.model.ActivityPackItemExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ActivityPackItemMapper { int countByExample(ActivityPackItemExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackMapper.java index 04ffdce81..d2d963e3a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ActivityPackMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ActivityPack; import com.accompany.business.model.ActivityPackExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ActivityPackMapper { int countByExample(ActivityPackExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillCheckMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillCheckMapper.java index e7b528163..38118868a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillCheckMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillCheckMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AnchorBillCheck; import com.accompany.business.model.AnchorBillCheckExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface AnchorBillCheckMapper { int countByExample(AnchorBillCheckExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapper.java index 16e87e6d6..734c9cc0d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AnchorBillRecord; import com.accompany.business.model.AnchorBillRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface AnchorBillRecordMapper { int countByExample(AnchorBillRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapperExpand.java index e32c284a0..5e1ddb930 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorBillRecordMapperExpand.java @@ -1,9 +1,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AnchorBillRecord; -import com.accompany.business.model.AnchorBillRecordExample; -import com.accompany.sharding.model.BillRecord; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorWhitelistMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorWhitelistMapper.java index 06eda43a3..e77d9dcd2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorWhitelistMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AnchorWhitelistMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AnchorWhitelist; import com.accompany.business.model.AnchorWhitelistExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface AnchorWhitelistMapper { int countByExample(AnchorWhitelistExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AppButtonMenuConfMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AppButtonMenuConfMapper.java index 1a37e13d5..25d56aa3c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AppButtonMenuConfMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AppButtonMenuConfMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AppButtonMenuConf; import com.accompany.business.model.AppButtonMenuConfExample; + import java.util.List; public interface AppButtonMenuConfMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AuditAccountMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AuditAccountMapper.java index fa2d64a08..924b9a5cc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AuditAccountMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AuditAccountMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AuditAccount; import com.accompany.business.model.AuditAccountExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface AuditAccountMapper { int countByExample(AuditAccountExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AutoGenRobotMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AutoGenRobotMapper.java index 18bf92d32..d6295193a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AutoGenRobotMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/AutoGenRobotMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.AutoGenRobot; import com.accompany.business.model.AutoGenRobotExample; + import java.util.List; public interface AutoGenRobotMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/BannerMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/BannerMapper.java index a1dab78ba..081e02501 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/BannerMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/BannerMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.Banner; import com.accompany.business.model.BannerExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface BannerMapper { int countByExample(BannerExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarCarportMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarCarportMapper.java index 2001dca85..02fc2fb7b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarCarportMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarCarportMapper.java @@ -3,9 +3,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.CarCarport; import com.accompany.business.model.CarCarportExample; import com.accompany.business.model.CarCarportKey; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface CarCarportMapper { int countByExample(CarCarportExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarGoodsMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarGoodsMapper.java index 382c52f44..214a97172 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarGoodsMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarGoodsMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.CarGoods; import com.accompany.business.model.CarGoodsExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface CarGoodsMapper { int countByExample(CarGoodsExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarRecordMapper.java index 8f9473713..041e0c5c5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CarRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.CarRecord; import com.accompany.business.model.CarRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface CarRecordMapper { int countByExample(CarRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java index 9cfbc808f..07ca754dc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChannelDistributeMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ChannelDistribute; import com.accompany.business.model.ChannelDistributeExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ChannelDistributeMapper { int countByExample(ChannelDistributeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityMapper.java index 8dfe83697..cdbdac4cc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityMapper.java @@ -3,9 +3,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ChargeActivity; import com.accompany.business.model.ChargeActivityExample; import com.accompany.business.model.ChargeActivityWithBLOBs; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ChargeActivityMapper { int countByExample(ChargeActivityExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java index 001c04615..51315899d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ChargeActivityVisitLogMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ChargeActivityVisitLog; import com.accompany.business.model.ChargeActivityVisitLogExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ChargeActivityVisitLogMapper { int countByExample(ChargeActivityVisitLogExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ClanHallOperateRecordMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ClanHallOperateRecordMapperExpand.java index 5351a489f..a5ee5ac44 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ClanHallOperateRecordMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ClanHallOperateRecordMapperExpand.java @@ -1,11 +1,8 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.ClanHallOperateRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - @Mapper public interface ClanHallOperateRecordMapperExpand { /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CustomServiceMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CustomServiceMapper.java index 34d23134d..0164af9f1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CustomServiceMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/CustomServiceMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.CustomService; import com.accompany.business.model.CustomServiceExample; + import java.util.List; public interface CustomServiceMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiCodeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiCodeMapper.java index 170dd53a0..9562781ed 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiCodeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiCodeMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.EmojiCode; import com.accompany.business.model.EmojiCodeExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface EmojiCodeMapper { int countByExample(EmojiCodeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiInviteCodeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiInviteCodeMapper.java index 597ea57fe..38c8f6773 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiInviteCodeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/EmojiInviteCodeMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.EmojiInviteCode; import com.accompany.business.model.EmojiInviteCodeExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface EmojiInviteCodeMapper { int countByExample(EmojiInviteCodeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ExchangeDiamondGoldRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ExchangeDiamondGoldRecordMapper.java index 6d8debddf..4a80cd5e4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ExchangeDiamondGoldRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ExchangeDiamondGoldRecordMapper.java @@ -1,11 +1,8 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.ExchangeDiamondGoldRecord; -import com.accompany.business.model.ExchangeDiamondGoldRecordExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; - /** * @author yangming * @date 2020-04-18 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceJsonMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceJsonMapper.java index bd5f0808d..da2c8a9ee 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceJsonMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceJsonMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.FaceJson; import com.accompany.business.model.FaceJsonExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface FaceJsonMapper { int countByExample(FaceJsonExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceMapper.java index bfe0e8d31..a5a48d2b4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FaceMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.Face; import com.accompany.business.model.FaceExample; + import java.util.List; public interface FaceMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java index 3fc65d300..032e8a58b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.FinanceGoldDiamondDetail; import com.accompany.business.model.FinanceGoldDiamondDetailExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface FinanceGoldDiamondDetailMapper { int countByExample(FinanceGoldDiamondDetailExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java index 097977a5a..b644efc16 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondDetailMapperExpand.java @@ -3,7 +3,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.FinanceGoldDiamondDetail; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface FinanceGoldDiamondDetailMapperExpand { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java index 7a75a2c93..cb1c063d4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceGoldDiamondMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.FinanceGoldDiamond; import com.accompany.business.model.FinanceGoldDiamondExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface FinanceGoldDiamondMapper { int countByExample(FinanceGoldDiamondExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java index 29a1690a4..c63f75d31 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/FinanceTypeConfigMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.FinanceTypeConfig; import com.accompany.business.model.FinanceTypeConfigExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface FinanceTypeConfigMapper { int countByExample(FinanceTypeConfigExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GenAccountRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GenAccountRecordMapper.java index bc2c418c2..358ebd925 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GenAccountRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GenAccountRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.GenAccountRecord; import com.accompany.business.model.GenAccountRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface GenAccountRecordMapper { int countByExample(GenAccountRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementMapper.java index ae8c54a18..5c43a5858 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementMapper.java @@ -1,11 +1,11 @@ package com.accompany.business.mybatismapper; -import java.util.List; - import com.accompany.business.model.giftAchievement.GiftAchievement; import com.accompany.business.model.giftAchievement.GiftAchievementExample; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface GiftAchievementMapper { int countByExample(GiftAchievementExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementTypeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementTypeMapper.java index 99714027e..5ff9551a3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementTypeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftAchievementTypeMapper.java @@ -1,11 +1,11 @@ package com.accompany.business.mybatismapper; -import java.util.List; - import com.accompany.business.model.giftAchievement.GiftAchievementType; import com.accompany.business.model.giftAchievement.GiftAchievementTypeExample; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface GiftAchievementTypeMapper { int countByExample(GiftAchievementTypeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftMagicMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftMagicMapper.java index 9fea5cebe..b3f42052a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftMagicMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftMagicMapper.java @@ -1,10 +1,8 @@ package com.accompany.business.mybatismapper; -import com.accompany.core.base.BaseMapper; import com.accompany.business.model.GiftMagic; import com.accompany.business.model.GiftMagicExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; +import com.accompany.core.base.BaseMapper; public interface GiftMagicMapper extends BaseMapper { // int countByExample(GiftMagicExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyConfigMapper.java index 215158fff..c1e4d08e6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyConfigMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyConfigMapper.java @@ -1,10 +1,8 @@ package com.accompany.business.mybatismapper; -import com.accompany.core.base.BaseMapper; import com.accompany.business.model.GiftNotifyConfig; import com.accompany.business.model.GiftNotifyConfigExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; +import com.accompany.core.base.BaseMapper; public interface GiftNotifyConfigMapper extends BaseMapper{ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyLevelMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyLevelMapper.java index 962e98599..6c050883e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyLevelMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GiftNotifyLevelMapper.java @@ -1,10 +1,8 @@ package com.accompany.business.mybatismapper; -import com.accompany.core.base.BaseMapper; import com.accompany.business.model.GiftNotifyLevel; import com.accompany.business.model.GiftNotifyLevelExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; +import com.accompany.core.base.BaseMapper; public interface GiftNotifyLevelMapper extends BaseMapper{ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java index 410816e5b..63a59099a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/GreetMsgMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.GreetMsg; import com.accompany.business.model.GreetMsgExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface GreetMsgMapper { int countByExample(GreetMsgExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapper.java index 2dc483d21..2fc47d63c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapper.java @@ -2,12 +2,12 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallAuth; import com.accompany.business.model.HallAuthExample; -import java.util.List; - import com.accompany.business.model.HallMember; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface HallAuthMapper { int countByExample(HallAuthExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapperExpand.java index cfdbbdf94..36d996d4d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallAuthMapperExpand.java @@ -1,11 +1,7 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.HallMemberAuth; -import com.accompany.business.vo.HallMemberAuthCodeVo; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * 2 * @Author: wangchuangbiao * 3 * @Date: 2019/3/2 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallGiftRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallGiftRecordMapper.java index de44ded09..eb26bb507 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallGiftRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallGiftRecordMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallGiftRecord; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface HallGiftRecordMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMapper.java index f78c866ef..1a716712d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMapper.java @@ -2,15 +2,12 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.Hall; import com.accompany.business.model.HallExample; - -import java.util.Date; -import java.util.List; - -import com.accompany.business.vo.hall.HallApplyVo; import com.accompany.business.vo.hall.HallVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface HallMapper { int countByExample(HallExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberAuthMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberAuthMapper.java index 40ddc6569..b71fd2418 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberAuthMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberAuthMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallMemberAuth; import com.accompany.business.model.HallMemberAuthExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface HallMemberAuthMapper { int countByExample(HallMemberAuthExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapper.java index 205a3bb88..ac93356d6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapper.java @@ -2,11 +2,11 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallMember; import com.accompany.business.model.HallMemberExample; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface HallMemberMapper { int countByExample(HallMemberExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapperExpand.java index dc9d6ff19..7187fc89e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallMemberMapperExpand.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallMember; -import com.accompany.business.model.clan.ClanHall; import com.accompany.business.vo.clan.ClanHallMemberVO; import com.accompany.business.vo.hall.HallMemberStatisticVo; import com.accompany.business.vo.hall.HallMemberVo; @@ -9,9 +8,7 @@ import com.accompany.business.vo.hall.HallStatisticVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; -import java.util.Map; /** * 2 * @Author: zhuct diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallOperateRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallOperateRecordMapper.java index 4b00151dc..5d040c3e2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallOperateRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallOperateRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HallOperateRecord; import com.accompany.business.model.HallOperateRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface HallOperateRecordMapper { int countByExample(HallOperateRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomChatRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomChatRecordMapper.java index 67ca2123d..42b567e0e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomChatRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomChatRecordMapper.java @@ -1,6 +1,5 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.HallGoldExchangeRecord; import com.accompany.business.model.HallRoomChatRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomGiftRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomGiftRecordMapper.java index 0fff8e0fd..ed88794a5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomGiftRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HallRoomGiftRecordMapper.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; public interface HallRoomGiftRecordMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearLimitMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearLimitMapper.java index c2b465f95..252f9dd40 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearLimitMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearLimitMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HeadwearLimit; import com.accompany.business.model.HeadwearLimitExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface HeadwearLimitMapper { int countByExample(HeadwearLimitExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearMapper.java index bbffff623..78eb21b43 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearMapper.java @@ -2,11 +2,11 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.Headwear; import com.accompany.business.model.HeadwearExample; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface HeadwearMapper { int countByExample(HeadwearExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapper.java index e27c0a614..7bf1a6a85 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.HeadwearRecord; import com.accompany.business.model.HeadwearRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface HeadwearRecordMapper { int countByExample(HeadwearRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapperExpand.java index e2e01c450..480bd83b6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/HeadwearRecordMapperExpand.java @@ -1,7 +1,5 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.Headwear; -import com.accompany.business.model.HeadwearExample; import com.accompany.business.model.HeadwearStatistics; import org.apache.ibatis.annotations.Param; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/InviteFissionBlankUserMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/InviteFissionBlankUserMapper.java index 12825468d..018347d1b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/InviteFissionBlankUserMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/InviteFissionBlankUserMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.InviteFissionBlankUser; -import com.accompany.business.model.UserInviteFissionRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface InviteFissionBlankUserMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LevelCharmMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LevelCharmMapper.java index 4cd8cfa6c..6762a05ae 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LevelCharmMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LevelCharmMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.LevelCharm; import com.accompany.business.model.LevelCharmExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface LevelCharmMapper { int countByExample(LevelCharmExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LiveAttestationMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LiveAttestationMapper.java index 99a657192..345d31242 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LiveAttestationMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LiveAttestationMapper.java @@ -6,7 +6,6 @@ import com.accompany.business.model.live.LiveRoomVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; public interface LiveAttestationMapper { long countByExample(LiveAttestationExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java index 90ba6b951..58c37813a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/LostUserMapper.java @@ -2,7 +2,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.LostUser; import com.accompany.business.model.LostUserExample; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/MsgPushRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/MsgPushRecordMapper.java index 93ac97022..2288ef724 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/MsgPushRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/MsgPushRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.MsgPushRecord; import com.accompany.business.model.MsgPushRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MsgPushRecordMapper { int countByExample(MsgPushRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OpenBoxRuleMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OpenBoxRuleMapper.java index 55d9acc82..fc47cb7a6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OpenBoxRuleMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OpenBoxRuleMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.vo.PrizePoolItemRuleVo; import org.apache.ibatis.annotations.Param; + import java.util.List; public interface OpenBoxRuleMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java index 733e50387..6b4db1507 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationActMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.OperationAct; import com.accompany.business.model.OperationActExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface OperationActMapper { int countByExample(OperationActExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java index 8517718a4..cea226d35 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OperationSmsRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.OperationSmsRecord; import com.accompany.business.model.OperationSmsRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface OperationSmsRecordMapper { int countByExample(OperationSmsRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OrderServMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OrderServMapper.java index 138d45f2b..359515bd0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OrderServMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/OrderServMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.OrderServ; import com.accompany.business.model.OrderServExample; + import java.util.List; public interface OrderServMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PanelMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PanelMapper.java index f546739d8..c36ad5425 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PanelMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PanelMapper.java @@ -1,10 +1,8 @@ package com.accompany.business.mybatismapper; -import com.accompany.core.base.BaseMapper; import com.accompany.business.model.Panel; import com.accompany.business.model.PanelExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; +import com.accompany.core.base.BaseMapper; public interface PanelMapper extends BaseMapper{ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java index 2a1a91c16..75a6100db 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PkActRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.PkActRecord; import com.accompany.business.model.PkActRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface PkActRecordMapper { int countByExample(PkActRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PrizeKeyRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PrizeKeyRecordMapper.java index 54bd71a8d..3c1906305 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PrizeKeyRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PrizeKeyRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.PrizeKeyRecord; import com.accompany.business.model.PrizeKeyRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface PrizeKeyRecordMapper { int countByExample(PrizeKeyRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeMapper.java index 48f7f8a1d..bc0fafcf4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.RedeemCode; import com.accompany.business.model.RedeemCodeExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface RedeemCodeMapper { int countByExample(RedeemCodeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeRecordMapper.java index eb7c6f4da..afc6f102c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RedeemCodeRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.RedeemCodeRecord; import com.accompany.business.model.RedeemCodeRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface RedeemCodeRecordMapper { int countByExample(RedeemCodeRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRewardMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRewardMapper.java index 56592b3c3..45c6c56e3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRewardMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRewardMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.RoomReward; import com.accompany.business.model.RoomRewardExample; + import java.util.List; public interface RoomRewardMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupMapper.java index 1b37b5a9b..144d5312b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.RoomRobotGroup; import com.accompany.business.model.RoomRobotGroupExample; + import java.util.List; public interface RoomRobotGroupMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupRelaMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupRelaMapper.java index d56bbf2e2..b4c285f63 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupRelaMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomRobotGroupRelaMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.RoomRobotGroupRela; import com.accompany.business.model.RoomRobotGroupRelaExample; + import java.util.List; public interface RoomRobotGroupRelaMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomTagSpecialConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomTagSpecialConfigMapper.java index 149001b06..300b49185 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomTagSpecialConfigMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomTagSpecialConfigMapper.java @@ -1,11 +1,11 @@ package com.accompany.business.mybatismapper; -import java.util.List; - import com.accompany.business.model.RoomTagSpecialConfig; import com.accompany.business.model.RoomTagSpecialConfigExample; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface RoomTagSpecialConfigMapper { int countByExample(RoomTagSpecialConfigExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SensitiveWordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SensitiveWordMapper.java index 89845164e..b7d2c9eb7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SensitiveWordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SensitiveWordMapper.java @@ -3,9 +3,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.SensitiveWord; import com.accompany.business.model.SensitiveWordExample; import com.accompany.business.model.SensitiveWordWithBLOBs; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SensitiveWordMapper { int countByExample(SensitiveWordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SkillTypeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SkillTypeMapper.java index 7e8a768f9..e86a59863 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SkillTypeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SkillTypeMapper.java @@ -2,11 +2,11 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.SkillType; import com.accompany.business.model.SkillTypeExample; -import java.util.List; - import com.accompany.business.model.live.LiveSkillTypeVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SkillTypeMapper { int countByExample(SkillTypeExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java index b12aa1f3b..e11633180 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SmsTemplateMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.SmsTemplate; import com.accompany.business.model.SmsTemplateExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SmsTemplateMapper { int countByExample(SmsTemplateExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SuperManagerOperateRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SuperManagerOperateRecordMapper.java index 03346a003..daaf26683 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SuperManagerOperateRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/SuperManagerOperateRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.SuperManagerOperateRecord; import com.accompany.business.model.SuperManagerOperateRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SuperManagerOperateRecordMapper { int countByExample(SuperManagerOperateRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java index ce31db1bc..02563a840 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TitleMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.Title; import com.accompany.business.model.TitleExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface TitleMapper { int countByExample(TitleExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java index a6b34e6b6..d89b8a34e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxItemMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.TopicBoxItem; import com.accompany.business.model.TopicBoxItemExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface TopicBoxItemMapper { int countByExample(TopicBoxItemExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java index e4ea4520d..f75afde6f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/TopicBoxMsgMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.TopicBoxMsg; import com.accompany.business.model.TopicBoxMsgExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface TopicBoxMsgMapper { int countByExample(TopicBoxMsgExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserActivityPackRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserActivityPackRecordMapper.java index 614e13159..a77ad876e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserActivityPackRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserActivityPackRecordMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserActivityPackRecord; import com.accompany.business.model.UserActivityPackRecordExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface UserActivityPackRecordMapper { int countByExample(UserActivityPackRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserBackpackMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserBackpackMapperExpand.java index 1e0544d08..5ec32d07e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserBackpackMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserBackpackMapperExpand.java @@ -1,11 +1,5 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.UserBackpack; -import com.accompany.business.model.UserBackpackExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - public interface UserBackpackMapperExpand { Double statisticsGiftValue(); } \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserFrozenRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserFrozenRecordMapper.java index 3cf53e60c..0d4c5856d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserFrozenRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserFrozenRecordMapper.java @@ -2,11 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserFrozenRecord; import com.accompany.business.model.UserFrozenRecordExample; -import java.util.List; - -import com.accompany.core.model.Users; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface UserFrozenRecordMapper { int countByExample(UserFrozenRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapper.java index cbb4dfb6f..5fabc4fc9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapper.java @@ -1,11 +1,11 @@ package com.accompany.business.mybatismapper; -import java.util.List; - import com.accompany.business.model.giftAchievement.UserGiftAchievementTypeRecord; import com.accompany.business.model.giftAchievement.UserGiftAchievementTypeRecordExample; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface UserGiftAchievementTypeRecordMapper { int countByExample(UserGiftAchievementTypeRecordExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapperExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapperExpand.java index 5cc765db6..658cd43cd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapperExpand.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftAchievementTypeRecordMapperExpand.java @@ -1,7 +1,5 @@ package com.accompany.business.mybatismapper; -import com.accompany.business.model.giftAchievement.UserGiftAchievementTypeRecord; -import com.accompany.business.model.giftAchievement.UserGiftAchievementTypeRecordExample; import com.accompany.business.vo.giftAchievement.UserGiftAchievementTypeExpandVo; import org.apache.ibatis.annotations.Param; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftBonusPerDayMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftBonusPerDayMapper.java index 75f116c04..d42d80718 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftBonusPerDayMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftBonusPerDayMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserGiftBonusPerDay; import com.accompany.business.model.UserGiftBonusPerDayExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface UserGiftBonusPerDayMapper { int countByExample(UserGiftBonusPerDayExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftWallMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftWallMapper.java index 48398d82f..02bcaa5c9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftWallMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserGiftWallMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserGiftWall; import com.accompany.business.model.UserGiftWallExample; + import java.util.List; public interface UserGiftWallMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserHeadwearMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserHeadwearMapper.java index 38bc16a97..096c29201 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserHeadwearMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserHeadwearMapper.java @@ -2,10 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserHeadwear; import com.accompany.business.model.UserHeadwearExample; +import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -import org.apache.ibatis.annotations.Param; public interface UserHeadwearMapper { int countByExample(UserHeadwearExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInRoomRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInRoomRecordMapper.java index e1123af59..69ffa50f0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInRoomRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInRoomRecordMapper.java @@ -1,15 +1,14 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserInRoomRecord; +import com.accompany.business.vo.room.InRoomRecordVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.Date; import java.util.List; -import com.accompany.business.vo.room.InRoomRecordVo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - public interface UserInRoomRecordMapper extends BaseMapper { /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteAwardMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteAwardMapper.java index 0cab927dd..779b5ef6f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteAwardMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteAwardMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserInviteAward; import com.accompany.business.model.UserInviteAwardExample; + import java.util.List; public interface UserInviteAwardMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteCodeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteCodeMapper.java index dae4c4911..c0a50f498 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteCodeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteCodeMapper.java @@ -1,11 +1,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserInviteCode; -import com.accompany.business.model.UserInviteCodeExample; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; public interface UserInviteCodeMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteRecordMapper.java index c1949890e..9241dd174 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserInviteRecordMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserInviteRecord; import com.accompany.business.model.UserInviteRecordExample; + import java.util.List; public interface UserInviteRecordMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserMagicWallMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserMagicWallMapper.java index 2b6c687ec..bd63dd5bf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserMagicWallMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserMagicWallMapper.java @@ -3,6 +3,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserMagicWall; import com.accompany.business.model.UserMagicWallExample; import com.accompany.business.model.UserMagicWallKey; + import java.util.List; public interface UserMagicWallMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserNameplateMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserNameplateMapper.java index cd1fb1bea..19097ee03 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserNameplateMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserNameplateMapper.java @@ -2,13 +2,11 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserNameplate; -import com.accompany.business.model.anchor.AnchorFansTeamMpPic; import com.accompany.core.vo.user.UserNameplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; @Mapper diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseMapper.java index fb9bdcff5..181d6b002 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * @author yangming diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseStatisticsMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseStatisticsMapper.java index b7957121e..0290eefe0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseStatisticsMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPurseStatisticsMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.UserPurseStatistics; import com.accompany.business.model.UserPurseStatisticsExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface UserPurseStatisticsMapper { int countByExample(UserPurseStatisticsExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UsersMapperExpend.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UsersMapperExpend.java index 69a5afdc6..2ab5889d1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UsersMapperExpend.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UsersMapperExpend.java @@ -1,6 +1,5 @@ package com.accompany.business.mybatismapper; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.core.model.Users; import com.accompany.payment.model.ChargeRecord; import org.apache.ibatis.annotations.Param; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java index b76d5cb97..38a69bfa4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WebConfigMapper.java @@ -2,9 +2,10 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.WebConfig; import com.accompany.business.model.WebConfigExample; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface WebConfigMapper { int countByExample(WebConfigExample example); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java index ef4f3ff8f..3f82d9a48 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithDrawPacketCashProdMapper.java @@ -2,6 +2,7 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.WithDrawPacketCashProd; import com.accompany.business.model.WithDrawPacketCashProdExample; + import java.util.List; public interface WithDrawPacketCashProdMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java index 9bfe53b63..e25732a3c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/WithdrawAccountMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper; import com.accompany.business.model.WithdrawAccount; -import com.accompany.business.model.WithdrawRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface WithdrawAccountMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/anchor/AnchorFansTeamMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/anchor/AnchorFansTeamMapper.java index 238abb533..dca730cd5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/anchor/AnchorFansTeamMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/anchor/AnchorFansTeamMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper.anchor; import com.accompany.business.model.anchor.AnchorFansTeam; -import com.accompany.business.vo.anchor.AnchorFansMemberVo; import com.accompany.business.vo.anchor.AnchorFansTeamJoinVo; import com.accompany.business.vo.anchor.AnchorFansTeamStatsDetailVo; import com.accompany.business.vo.anchor.AnchorFansTeamStatsVo; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/dress/UserChatBubbleMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/dress/UserChatBubbleMapper.java index 5e8d4e69d..6052dc095 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/dress/UserChatBubbleMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/dress/UserChatBubbleMapper.java @@ -12,7 +12,6 @@ package com.accompany.business.mybatismapper.dress; import com.accompany.business.model.dress.UserChatBubble; import com.accompany.business.vo.dress.UserChatBubbleVO; -import com.accompany.business.vo.dress.UserInfoCardVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/family/FamilyGiftRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/family/FamilyGiftRecordMapper.java index 077d7b806..36546da60 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/family/FamilyGiftRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/family/FamilyGiftRecordMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper.family; import com.accompany.business.model.family.FamilyGiftRecord; -import com.accompany.business.vo.family.FamilyMemberIncomeItemVo; import com.accompany.business.vo.family.FamilyUserIncomeItemVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java index b7de4a1b0..ba676af32 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/gamepartner/UserGamePartnerInfoMapper.java @@ -2,8 +2,6 @@ package com.accompany.business.mybatismapper.gamepartner; import com.accompany.business.model.gamepartner.UserGamePartnerInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildGiftRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildGiftRecordMapper.java index 136071b94..e5c1bc1ee 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildGiftRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildGiftRecordMapper.java @@ -4,7 +4,6 @@ import com.accompany.business.model.guild.GuildGiftRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface GuildGiftRecordMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberWeekLevelRewardRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberWeekLevelRewardRecordMapper.java index de23b87bd..cad674f2a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberWeekLevelRewardRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/guild/GuildMemberWeekLevelRewardRecordMapper.java @@ -1,6 +1,5 @@ package com.accompany.business.mybatismapper.guild; -import com.accompany.business.model.guild.GuildMemberWeekLevelReward; import com.accompany.business.model.guild.GuildMemberWeekLevelRewardRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ip/IpRegionLimitRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ip/IpRegionLimitRecordMapper.java index 2004cab8b..0cab03233 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ip/IpRegionLimitRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/ip/IpRegionLimitRecordMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper.ip; import com.accompany.business.model.ip.IpRegionLimitRecord; -import com.accompany.business.model.ip.IpRegionWhite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/Lucky24StatMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/Lucky24StatMapper.java index 4a8b74766..5539ad7a4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/Lucky24StatMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/Lucky24StatMapper.java @@ -2,10 +2,8 @@ package com.accompany.business.mybatismapper.lucky; import com.accompany.sharding.vo.Lucky24PersonalStat; import com.accompany.sharding.vo.Lucky24PlatformStat; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface Lucky24StatMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/LuckyGiftRewardMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/LuckyGiftRewardMapper.java index 9e0845ad2..b44b27229 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/LuckyGiftRewardMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/lucky/LuckyGiftRewardMapper.java @@ -4,8 +4,6 @@ import com.accompany.business.model.lucky.LuckyGiftReward; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import java.util.Map; - /** * @author: liaozetao * @date: 2024/3/14 10:53 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/luckybag/LuckyBagLinearPoolMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/luckybag/LuckyBagLinearPoolMapper.java index e9be86a8b..5c537cf88 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/luckybag/LuckyBagLinearPoolMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/luckybag/LuckyBagLinearPoolMapper.java @@ -1,7 +1,6 @@ package com.accompany.business.mybatismapper.luckybag; import com.accompany.business.model.luckybag.LuckyBagLinearPool; -import com.accompany.business.model.luckybag.LuckyBagPool; import com.accompany.business.vo.luckybag.LuckyBagPoolVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/redenvelope/RedEnvelopeBackMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/redenvelope/RedEnvelopeBackMapper.java index 8fffb9e05..d1ee22169 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/redenvelope/RedEnvelopeBackMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/redenvelope/RedEnvelopeBackMapper.java @@ -2,9 +2,6 @@ package com.accompany.business.mybatismapper.redenvelope; import com.accompany.business.model.redenvelope.RedEnvelopeBack; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; public interface RedEnvelopeBackMapper extends BaseMapper { } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/PrivateChatItemMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/PrivateChatItemMapper.java index 039b923de..1a18801d2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/PrivateChatItemMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/PrivateChatItemMapper.java @@ -11,11 +11,7 @@ package com.accompany.business.mybatismapper.room; import com.accompany.business.model.room.PrivateChatItem; -import com.accompany.business.model.room.RoomPlayType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; /** *
接口描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomAwardRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomAwardRecordMapper.java index b20622f38..7a3711666 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomAwardRecordMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomAwardRecordMapper.java @@ -1,7 +1,7 @@ package com.accompany.business.mybatismapper.room; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.accompany.business.model.room.RoomBoomAwardRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 房间Boom玩法阶段奖励记录 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelAwardMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelAwardMapper.java index a95344c1e..1d6d05819 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelAwardMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelAwardMapper.java @@ -1,7 +1,7 @@ package com.accompany.business.mybatismapper.room; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.accompany.business.model.room.RoomBoomLevelAward; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 房间Boom玩法等级奖励配置 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelMapper.java index 8f30e931f..b901a90d6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomLevelMapper.java @@ -1,7 +1,7 @@ package com.accompany.business.mybatismapper.room; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.accompany.business.model.room.RoomBoomLevel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 房间Boom玩法等级配置 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java index 371eb9a8f..8f5f23def 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java @@ -1,7 +1,7 @@ package com.accompany.business.mybatismapper.room; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.accompany.business.model.room.RoomBoomSign; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomInviteCodeMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomInviteCodeMapper.java index 853487679..08e53cda4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomInviteCodeMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomInviteCodeMapper.java @@ -1,11 +1,7 @@ package com.accompany.business.mybatismapper.room; import com.accompany.business.model.RoomInviteCode; -import com.accompany.business.vo.room.RoomInviteCodeVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; public interface RoomInviteCodeMapper extends BaseMapper { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/vip/VipInfoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/vip/VipInfoMapper.java index f659d4dc4..318882aeb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/vip/VipInfoMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/vip/VipInfoMapper.java @@ -10,7 +10,6 @@ */ package com.accompany.business.mybatismapper.vip; -import com.accompany.business.model.vip.VipAuthItem; import com.accompany.business.model.vip.VipInfo; import com.accompany.business.vo.vip.VipWithAuthVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AccountLoginRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AccountLoginRecordService.java index 0e318258a..61eb9d5f6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AccountLoginRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AccountLoginRecordService.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; -import java.util.Optional; /** * Created by Administrator on 2017/12/21. diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java index 09b6b435b..cb1937d88 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppStoreService.java @@ -1,10 +1,10 @@ package com.accompany.business.service; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.service.common.JedisService; +import com.accompany.core.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppUiSettingServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppUiSettingServiceImpl.java index d7a236016..f15f8c1a8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppUiSettingServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppUiSettingServiceImpl.java @@ -5,7 +5,6 @@ import com.accompany.business.mybatismapper.AppUiSettingMapper; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; -import java.util.regex.Pattern; import static com.accompany.common.redis.RedisKey.app_ui_setting; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AutoGenRobotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AutoGenRobotService.java index f35e86152..74781e17e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AutoGenRobotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AutoGenRobotService.java @@ -8,6 +8,7 @@ import com.accompany.business.mybatismapper.AutoGenRobotMapper; import com.accompany.business.mybatismapper.GenAccountRecordMapper; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.TokenRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.CommonUtil; @@ -17,7 +18,6 @@ import com.accompany.core.model.Account; import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.AccountMapper; import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.core.service.SysConfService; import com.accompany.core.service.account.ErBanNoService; import com.accompany.core.service.account.NetEaseService; @@ -28,7 +28,10 @@ import com.accompany.core.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BaseSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BaseSendService.java index 668da123e..9a25f8174 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BaseSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BaseSendService.java @@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeAreaService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeAreaService.java index 1403ca71c..14335ee36 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeAreaService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeAreaService.java @@ -1,20 +1,25 @@ package com.accompany.business.service; +import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; +import com.accompany.core.service.base.BaseService; import com.accompany.payment.model.ChargeChannel; import com.accompany.payment.model.ChargeRegion; +import com.accompany.payment.service.ChargeChannelProdService; +import com.accompany.payment.service.ChargeChannelService; import com.accompany.payment.service.ChargeRegionService; -import com.accompany.common.constant.Constant; -import com.accompany.core.service.base.BaseService; -import com.accompany.payment.service.*; -import com.accompany.payment.vo.*; +import com.accompany.payment.vo.ChargeAreaInfoVO; +import com.accompany.payment.vo.ChargePageVO; +import com.accompany.payment.vo.ChargeWayGroupInfoVO; +import com.accompany.payment.vo.ChargeWayInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java index 00d0816e8..f7a7d1c19 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java @@ -1,11 +1,9 @@ package com.accompany.business.service; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.annotation.CancelUidTag; import com.accompany.business.message.PayFinishMessage; -import com.accompany.business.service.activity.h5.ActivityOfChargeService; import com.accompany.business.service.charge.LuckyTarotChargeService; import com.accompany.business.service.charge.VipChargeService; import com.accompany.business.service.mq.RocketMQService; @@ -26,20 +24,17 @@ import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; -import com.accompany.core.vo.vip.VipBaseInfoVO; import com.accompany.payment.event.ChargeSuccessEvent; import com.accompany.payment.mapper.ChargeRecordMapper; import com.accompany.payment.model.*; import com.accompany.payment.service.*; import com.accompany.payment.vo.VipOpenParams; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.gson.reflect.TypeToken; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java index d00524992..163f114f1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/LuckySeaPreWarningService.java @@ -10,21 +10,21 @@ */ package com.accompany.business.service; -import com.accompany.business.dto.luckysea.LuckySeaPreWarningConfig; import com.accompany.business.dto.luckysea.LuckySeaBroadCastDTO; import com.accompany.business.dto.luckysea.LuckySeaGoldPreWarningDTO; +import com.accompany.business.dto.luckysea.LuckySeaPreWarningConfig; import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import com.accompany.business.model.activity.luckysea.LuckySeaDrawItem; import com.accompany.business.mybatismapper.activity.LuckySeaPreWarningMapper; import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService; import com.accompany.business.service.activities.luckySea.LuckySeaStockService; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; import com.accompany.common.push.MarkdownMessage; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.message.MessageRobotPushService; import com.alibaba.fastjson.JSON; import com.google.common.collect.ImmutableMap; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MsgPushService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MsgPushService.java index 7e90b4a5f..de64265a8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MsgPushService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MsgPushService.java @@ -4,12 +4,12 @@ import cn.hutool.core.util.StrUtil; import com.accompany.business.model.MsgPushRecord; import com.accompany.business.mybatismapper.MsgPushRecordMapper; import com.accompany.business.param.neteasepush.*; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.model.PartitionInfo; import com.accompany.core.mybatismapper.AccountLoginRecordMapperExpand; +import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java index 72fd94305..34fc83f12 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java @@ -1,13 +1,13 @@ package com.accompany.business.service; -import com.accompany.core.base.BeanMapper; import com.accompany.business.model.Panel; import com.accompany.business.model.PanelExample; import com.accompany.business.mybatismapper.PanelMapper; -import com.accompany.core.service.base.BaseService; import com.accompany.business.vo.PanelVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; +import com.accompany.core.base.BeanMapper; +import com.accompany.core.service.base.BaseService; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java index 913e26f22..e46796c46 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java @@ -8,11 +8,11 @@ import com.accompany.business.mybatismapper.RoomRobotGroupMapper; import com.accompany.business.mybatismapper.RoomRobotGroupRelaMapper; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.model.Room; import com.accompany.core.model.Users; -import com.accompany.common.netease.ErBanNetEaseService; import com.google.common.collect.Lists; import com.google.gson.Gson; import org.slf4j.Logger; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendChatRoomMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendChatRoomMsgService.java index 94afdf17f..48b61629e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendChatRoomMsgService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendChatRoomMsgService.java @@ -3,10 +3,10 @@ package com.accompany.business.service; import com.accompany.business.service.room.RoomQueryService; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; -import com.accompany.common.netease.ErBanNetEaseService; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendSysMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendSysMsgService.java index a84677f54..9b17a25c2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendSysMsgService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendSysMsgService.java @@ -2,16 +2,15 @@ package com.accompany.business.service; import cn.hutool.core.util.StrUtil; import com.accompany.business.enums.message.ResourceTypeEnum; -import com.accompany.business.model.AppVersion; import com.accompany.business.param.neteasepush.*; import com.accompany.business.service.room.RoomQueryService; -import com.accompany.business.vo.AppVersionVo; import com.accompany.business.vo.message.FloatingMessageTemplate; import com.accompany.business.vo.message.MessageTemplate; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.utils.GsonUtil; import com.accompany.common.utils.ReplaceAppDomainUtils; @@ -20,7 +19,6 @@ import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.model.Account; import com.accompany.core.model.Room; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.I18NMessageSourceUtil; @@ -34,7 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.ThreadPoolExecutor; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SensitiveService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SensitiveService.java index 1c89b661c..07c29cc88 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SensitiveService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SensitiveService.java @@ -7,12 +7,12 @@ import com.accompany.business.model.SensitiveWordWithBLOBs; import com.accompany.business.mybatismapper.SensitiveWordMapper; import com.accompany.business.mybatismapper.SensitiveWordNewMapper; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.github.pagehelper.PageInfo; + import java.util.Date; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java index aa077ccbd..e56af296d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WebConfigService.java @@ -3,11 +3,11 @@ package com.accompany.business.service; import com.accompany.business.model.WebConfig; import com.accompany.business.model.WebConfigExample; import com.accompany.business.mybatismapper.WebConfigMapper; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.BlankUtil; +import com.accompany.core.service.base.BaseService; +import com.accompany.core.service.common.JedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/YidunCallbackService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/YidunCallbackService.java index 938256c8d..8b7c0dc95 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/YidunCallbackService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/YidunCallbackService.java @@ -3,7 +3,6 @@ package com.accompany.business.service; import cn.hutool.core.util.ObjectUtil; import com.accompany.business.dto.yidun.AntispamDto; import com.accompany.business.dto.yidun.YidunCallBackDataDto; -import com.accompany.business.event.RoomCacheDealEvent; import com.accompany.business.model.PrivatePhoto; import com.accompany.business.model.family.Family; import com.accompany.business.model.guild.Guild; @@ -13,28 +12,26 @@ import com.accompany.business.service.family.FamilyService; import com.accompany.business.service.guild.GuildService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.PrivatePhotoService; -import com.accompany.core.base.SpringContextHolder; import com.accompany.common.config.SystemConfig; import com.accompany.common.config.YidunImageConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.BaseNetEaseRet; import com.accompany.common.redis.RedisKey; -import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.model.Room; -import com.accompany.core.result.YidunBusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; +import com.accompany.core.base.SpringContextHolder; +import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; +import com.accompany.core.model.Room; import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.UsersMapper; +import com.accompany.core.result.YidunBusiResult; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.I18NMessageSourceUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesDrawService.java index 9b38824ce..2540601be 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesDrawService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesDrawService.java @@ -16,12 +16,12 @@ import com.accompany.business.vo.activity.ActivitiesDrawPrizeInfoVo; import com.accompany.business.vo.activity.ActivityPackVo; import com.accompany.business.vo.openbox.DrawPrizeItemVo; import com.accompany.common.constant.Constant; -import com.accompany.core.exception.ServiceException; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; import com.accompany.core.base.BeanMapper; +import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisLockService; @@ -40,7 +40,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Created By LeeNana on 2019/10/28. diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java index 76c7269ad..e2a019fc2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaDrawServiceImpl.java @@ -1,6 +1,5 @@ package com.accompany.business.service.activities.luckySea.impl; -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; import com.accompany.business.event.LuckySeaDrawMessageEvent; import com.accompany.business.message.LuckySeaDrawMessage; import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; @@ -8,7 +7,6 @@ import com.accompany.business.model.activity.luckysea.LuckySeaItem; import com.accompany.business.model.activity.luckysea.LuckySeaItemGroup; import com.accompany.business.model.activity.luckysea.LuckySeaUserDrawRecord; import com.accompany.business.service.activities.luckySea.*; -import com.accompany.business.service.callbattle.ActCallBattleBizService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.room.UserInOutRoomRecordService; @@ -17,7 +15,6 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.RandomUtil; import com.accompany.common.utils.StringUtils; -import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; import com.alibaba.fastjson.JSON; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityAwardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityAwardService.java index 7716ea5e2..19e38d82f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityAwardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityAwardService.java @@ -3,17 +3,19 @@ package com.accompany.business.service.activity; import com.accompany.business.model.ActivityAward; import com.accompany.business.model.ActivityAwardExample; import com.accompany.business.mybatismapper.ActivityAwardMapper; -import com.accompany.core.service.base.BaseService; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.BlankUtil; +import com.accompany.core.service.base.BaseService; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java index cb283a11d..5452d2377 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityConfigService.java @@ -3,15 +3,15 @@ package com.accompany.business.service.activity; import com.accompany.business.model.ActivityConfig; import com.accompany.business.model.ActivityConfigExample; import com.accompany.business.mybatismapper.ActivityConfigMapper; -import com.accompany.core.service.common.JedisService; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; +import com.accompany.core.service.common.JedisService; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java index e9a4b1b2f..f6bc21995 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/BigGiftNameplateActivityService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.activity; import com.accompany.business.message.GiftMessage; -import com.accompany.business.model.ActivityConfig; import com.accompany.business.model.Nameplate; import com.accompany.business.model.activity.BigGiftNameplateActivityConfig; import com.accompany.business.mybatismapper.NameplateMapper; @@ -14,7 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; @Service public class BigGiftNameplateActivityService extends BaseService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java index 00ec78ce3..7dbe93649 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/CarActivityService.java @@ -1,6 +1,6 @@ package com.accompany.business.service.activity; -import com.accompany.business.model.*; +import com.accompany.business.model.ActivityConfig; import com.accompany.business.model.activity.CarActivityConfig; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; @@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class CarActivityService extends BaseService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityService.java index 9e84fdd36..ed4f73a28 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ChargeActivityService.java @@ -5,12 +5,10 @@ import com.accompany.business.constant.EntranceTypeEnum; import com.accompany.business.constant.OsEnum; import com.accompany.business.model.*; import com.accompany.business.mybatismapper.ChargeActivityMapper; -import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; -import com.accompany.payment.service.ChargeRecordService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/FirstRechargeActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/FirstRechargeActivityService.java index 4add599f5..d72a94041 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/FirstRechargeActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/FirstRechargeActivityService.java @@ -1,7 +1,9 @@ package com.accompany.business.service.activity; import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.*; +import com.accompany.business.model.CarGoods; +import com.accompany.business.model.Headwear; +import com.accompany.business.model.Nameplate; import com.accompany.business.model.activity.FirstRechargeActivityConfig; import com.accompany.business.mybatismapper.CarGoodsMapper; import com.accompany.business.mybatismapper.NameplateMapper; @@ -14,7 +16,8 @@ import com.accompany.core.service.base.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; /** * 首次充值赠送特权活动 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java index f74f06bfa..c086a2cef 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java @@ -3,14 +3,14 @@ package com.accompany.business.service.activity; import com.accompany.business.model.OperationAct; import com.accompany.business.model.OperationActExample; import com.accompany.business.mybatismapper.OperationActMapper; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.BlankUtil; -import org.springframework.util.CollectionUtils; +import com.accompany.core.service.base.BaseService; +import com.accompany.core.service.common.JedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/WeekStarConfigService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/WeekStarConfigService.java index 917c17a51..8e996b2f4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/WeekStarConfigService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/WeekStarConfigService.java @@ -3,19 +3,13 @@ package com.accompany.business.service.activity; import com.accompany.business.model.WeekStarConfig; import com.accompany.business.mybatismapper.WeekStarConfigMapper; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.WeekUtil; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.List; /** * @author yangming diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5LevelAwardServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5LevelAwardServiceImpl.java index e44d4c1e2..e81a6904a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5LevelAwardServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityH5LevelAwardServiceImpl.java @@ -6,21 +6,17 @@ import com.accompany.business.model.activity.h5.ActivityH5LevelExp; import com.accompany.business.mybatismapper.activity.h5.ActivityH5LevelAwardMapper; import com.accompany.business.param.ActivityH5Param; import com.accompany.business.vo.activity.h5.ActivityH5LevelAwardVo; -import com.accompany.core.service.SysConfService; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfCpService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfCpService.java index c91091bf2..45dbc402e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfCpService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfCpService.java @@ -10,7 +10,6 @@ import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.activity.h5.ActivityH5CpRankVo; import com.accompany.business.vo.activity.h5.CpUserVo; import com.accompany.business.vo.activity.h5.SquareCpUserVo; -import com.accompany.business.vo.relation.RelationUserVO; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.NumberUtils; import com.accompany.core.enumeration.PartitionEnum; @@ -20,10 +19,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RMap; import org.redisson.api.RScoredSortedSet; -import org.redisson.api.RSet; import org.redisson.api.RedissonClient; -import org.redisson.client.RedisClient; -import org.redisson.client.codec.LongCodec; import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.ScoredEntry; import org.springframework.beans.factory.annotation.Autowired; @@ -38,8 +34,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static java.util.Comparator.comparing; - @Service @Slf4j public class ActivityOfCpService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/administrator/SuperAdminWebService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/administrator/SuperAdminWebService.java index ac20ceef1..0fe78eccd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/administrator/SuperAdminWebService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/administrator/SuperAdminWebService.java @@ -6,7 +6,6 @@ import com.accompany.business.event.RoomLimitUpdateEvent; import com.accompany.business.event.room.RoomPasswordChangeEvent; import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.hall.HallSuperManageService; import com.accompany.business.service.room.RoomService; @@ -14,6 +13,7 @@ import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.SuperRoomOperateVo; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomUserListRet; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamAudioRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamAudioRecordService.java index 728febb08..8efd0c2e1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamAudioRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamAudioRecordService.java @@ -5,8 +5,6 @@ import com.accompany.business.vo.anchor.AnchorFansTeamAudioRecordVo; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import java.io.IOException; - public interface AnchorFansTeamAudioRecordService extends IService { /** * 获取审核的粉丝团铭牌数据 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMpPicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMpPicService.java index a19466204..8dfe62f40 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMpPicService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMpPicService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.anchor; import com.accompany.business.model.anchor.AnchorFansTeamMpPic; -import com.accompany.business.vo.anchor.PrivilegeFansMpVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansPrivilegeConfigServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansPrivilegeConfigServiceImpl.java index 4a92a33e8..eb579bd3b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansPrivilegeConfigServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansPrivilegeConfigServiceImpl.java @@ -15,18 +15,14 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.Gson; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTaskServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTaskServiceImpl.java index e691eb003..6c839afb5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTaskServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTaskServiceImpl.java @@ -1,7 +1,6 @@ package com.accompany.business.service.anchor.impl; import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.anchor.AnchorFansPrivilegeConfig; import com.accompany.business.model.anchor.AnchorFansTask; import com.accompany.business.mybatismapper.anchor.AnchorFansTaskMapper; import com.accompany.business.service.anchor.AnchorFansTaskService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamAudioRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamAudioRecordServiceImpl.java index 59c6b9779..749228235 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamAudioRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamAudioRecordServiceImpl.java @@ -4,7 +4,6 @@ import com.accompany.business.constant.nameplate.NameplateStyleTypeEnum; import com.accompany.business.model.anchor.*; import com.accompany.business.mybatismapper.anchor.AnchorFansTeamAudioRecordMapper; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.anchor.*; import com.accompany.business.service.netease.YidunCheckUtil; @@ -15,6 +14,7 @@ import com.accompany.business.vo.anchor.AnchorFansTeamMessageVo; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMpPicServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMpPicServiceImpl.java index 8d213ba12..2e1b0a9e1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMpPicServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMpPicServiceImpl.java @@ -3,7 +3,6 @@ package com.accompany.business.service.anchor.impl; import com.accompany.business.model.anchor.AnchorFansTeamMpPic; import com.accompany.business.mybatismapper.anchor.AnchorFansTeamMpPicMapper; import com.accompany.business.service.anchor.AnchorFansTeamMpPicService; -import com.accompany.business.vo.anchor.PrivilegeFansMpVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java index 74f7f5cad..a954c1463 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java @@ -12,7 +12,6 @@ import com.accompany.business.mybatismapper.UserNameplateMapper; import com.accompany.business.mybatismapper.anchor.AnchorFansTeamMapper; import com.accompany.business.param.UserBackpackParam; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.anchor.*; import com.accompany.business.service.api.QinniuService; @@ -33,6 +32,7 @@ import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.AnchorFansLevelExperienceArr; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.*; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSRefundV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSRefundV2Service.java index 3409fcce3..16783b6f8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSRefundV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/apple/IOSRefundV2Service.java @@ -31,7 +31,10 @@ import com.accompany.payment.risk.RechargeRiskUserService; import com.accompany.payment.utils.Uid2UuidUtils; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.*; +import org.redisson.api.RAtomicLong; +import org.redisson.api.RMap; +import org.redisson.api.RSet; +import org.redisson.api.RedissonClient; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/audiocard/AudioCardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/audiocard/AudioCardService.java index 5f40d5253..092d30b15 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/audiocard/AudioCardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/audiocard/AudioCardService.java @@ -2,11 +2,11 @@ package com.accompany.business.service.audiocard; import com.accompany.business.model.audiocard.UserAudioCard; import com.accompany.business.mybatismapper.audiocard.AudioCardMapper; +import com.accompany.common.constant.Constant; +import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.vo.audiocard.UserAudioCardVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java index 70abc89c4..a7f6700fa 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java @@ -3,15 +3,14 @@ package com.accompany.business.service.box; import com.accompany.business.constant.BoxTypeEnum; import com.accompany.business.constant.PrizeLevelEnum; import com.accompany.business.event.box.BoxPrizeEvent; -import com.accompany.business.message.PrizeEntity; import com.accompany.business.message.BoxPrizeMessage; +import com.accompany.business.message.PrizeEntity; import com.accompany.business.model.Prize; import com.accompany.business.model.box.NormalBigPrizeConfig; import com.accompany.business.param.neteasepush.Payload; +import com.accompany.business.service.findlove.FindLoveMsgService; import com.accompany.business.service.prize.PrizeContext; import com.accompany.business.service.prize.PrizeStrategyFactory; -import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.business.service.findlove.FindLoveMsgService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; @@ -20,6 +19,7 @@ import com.accompany.common.config.SystemConfig; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.constant.NetEaseCode; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.push.MarkdownMessage; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxService.java index ad7a48a46..bb3289d86 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxService.java @@ -5,8 +5,8 @@ import com.accompany.business.constant.BoxTypeEnum; import com.accompany.business.constant.PrizeLevelEnum; import com.accompany.business.constant.PrizePoolItemTypeEnum; import com.accompany.business.constant.PrizeTypeEnum; -import com.accompany.business.message.PrizeEntity; import com.accompany.business.message.BoxPrizeMessage; +import com.accompany.business.message.PrizeEntity; import com.accompany.business.model.*; import com.accompany.business.model.box.NormalBigPrizeConfig; import com.accompany.business.mybatismapper.PrizeKeyRecordMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java index 08d12f3c1..9cf67ec51 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleDrawService.java @@ -13,7 +13,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java index 8846c8e50..20f01ab00 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleMessageService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.callbattle; import com.accompany.business.dto.activity.callbattle.ActCallBattleRoomTipConfig; import com.accompany.business.model.callbattle.ActCallBattleUserDrawRecord; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.room.UserInOutRoomRecordService; @@ -10,6 +9,7 @@ import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.activities.LuckySeaPushMsg; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java index f3db5ad02..9f80d14d3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattlePreWarningService.java @@ -13,14 +13,13 @@ package com.accompany.business.service.callbattle; import com.accompany.business.dto.callbattle.ActCallBattleBroadCastDTO; import com.accompany.business.dto.callbattle.ActCallBattleGoldPreWarningDTO; import com.accompany.business.dto.callbattle.ActCallBattlePreWarningConfig; -import com.accompany.common.push.MarkdownMessage; import com.accompany.business.mybatismapper.callbattle.ActCallBattlePreWarningMapper; -import com.accompany.business.service.callbattle.impl.ActCallBattleBizServiceImpl; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.push.MarkdownMessage; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.message.MessageRobotPushService; import com.alibaba.fastjson.JSON; import com.google.common.collect.ImmutableMap; import lombok.extern.slf4j.Slf4j; @@ -32,7 +31,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java index 107bf08bf..99a9f9ac0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/ActCallBattleStockService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.callbattle; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.core.base.SpringContextHolder; import com.accompany.core.service.SysConfService; import org.redisson.api.RAtomicDouble; import org.redisson.api.RedissonClient; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java index 5b17906a4..f12fb7180 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/callbattle/impl/ActCallBattleBizServiceImpl.java @@ -10,8 +10,8 @@ */ package com.accompany.business.service.callbattle.impl; -import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; import com.accompany.business.constant.activities.ActivitesPackTypeEnum; +import com.accompany.business.dto.activity.callbattle.ActCallBattleConfig; import com.accompany.business.dto.callbattle.ActCallBattleUserDrawResultDto; import com.accompany.business.dto.callbattle.ActCallBattleUserRoundStatDTO; import com.accompany.business.model.ActivityPack; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarPayService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarPayService.java index 8696ebac0..4a2efff52 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarPayService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarPayService.java @@ -11,7 +11,6 @@ import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.annotation.Frozen; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; @@ -24,7 +23,6 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSONObject; @@ -36,10 +34,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.concurrent.Executors; ; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarportService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarportService.java index f7bc7768f..d0f460664 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarportService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/car/CarportService.java @@ -35,7 +35,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.stream.Collectors; @Service public class CarportService extends BaseService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java index a7725f4b7..8ff5f4762 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/AbstractCertifyService.java @@ -33,7 +33,10 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.UUID; @Slf4j public abstract class AbstractCertifyService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java index f3b7a522c..477133020 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/certification/aliyun/FinancialFaceVerifyClient.java @@ -1,7 +1,6 @@ package com.accompany.business.service.certification.aliyun; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.aliyun.cloudauth20190307.Client; import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyRequest; import com.aliyun.cloudauth20190307.models.DescribeFaceVerifyResponse; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/LuckyTarotChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/LuckyTarotChargeService.java index 8f74f7727..a9eb6f01b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/LuckyTarotChargeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/LuckyTarotChargeService.java @@ -22,7 +22,6 @@ import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.*; - import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; @@ -32,7 +31,10 @@ import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.vo.BaseResponseVO; import com.accompany.payment.model.ChargeProd; import com.accompany.payment.model.LuckyTarotRecord; -import com.accompany.payment.service.*; +import com.accompany.payment.service.ChargeProdService; +import com.accompany.payment.service.ChargeRecordService; +import com.accompany.payment.service.LuckyTarotRecordService; +import com.accompany.payment.service.PayCenterService; import com.accompany.payment.vo.LuckyTarotRecordVo; import com.google.gson.reflect.TypeToken; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/VipChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/VipChargeService.java index de59137ca..f735eb8ce 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/VipChargeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/VipChargeService.java @@ -11,8 +11,6 @@ package com.accompany.business.service.charge; import cn.hutool.core.util.StrUtil; -import com.accompany.business.dto.vip.OpenVipConfigDTO; -import com.accompany.business.service.apple.IOSStoreKitV2Service; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.service.vip.VipLevelBizService; @@ -21,15 +19,12 @@ import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.CommonUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.vo.vip.UserVipInfoVO; -import com.accompany.core.vo.vip.VipBaseInfoVO; -import com.accompany.payment.iospay.IOSPayPlaService; import com.accompany.payment.model.ChargeProd; import com.accompany.payment.model.UserVipRecord; import com.accompany.payment.service.PayCenterService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/ChatRoomServiceFactory.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/ChatRoomServiceFactory.java index cdae46199..86c79b9f6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/ChatRoomServiceFactory.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/ChatRoomServiceFactory.java @@ -1,7 +1,6 @@ package com.accompany.business.service.chat; import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.service.rank.IRank; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomForMiniGameService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomForMiniGameService.java index 8d2b6b90e..8e9d30452 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomForMiniGameService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomForMiniGameService.java @@ -23,10 +23,8 @@ import com.accompany.business.service.miniGame.MiniGameService; import com.accompany.business.vo.chat.ChatRoomVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BeanUtil; import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomManageServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomManageServiceImpl.java index f8629f910..6d7af92c1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomManageServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomManageServiceImpl.java @@ -20,7 +20,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomServiceImpl.java index 364b63655..205cecea8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/ChatRoomServiceImpl.java @@ -3,13 +3,8 @@ package com.accompany.business.service.chat.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.model.chat.ChatRoom; -import com.accompany.business.model.redis.RoomMic; import com.accompany.business.mybatismapper.chat.ChatRoomMapper; -import com.accompany.business.service.chat.ChatRoomManageService; import com.accompany.business.service.chat.ChatRoomService; -import com.accompany.business.service.chat.ChatRoomServiceFactory; -import com.accompany.business.service.chat.IChatRoom; -import com.accompany.business.vo.chat.ChatRoomVo; import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.ChatRoomRet; import com.accompany.common.netease.neteaseacc.result.RoomRet; @@ -17,20 +12,21 @@ import com.accompany.common.netease.neteaseacc.result.TokenRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BeanUtil; -import com.accompany.common.utils.GsonUtil; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.account.NetEaseService; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PrivateChatServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PrivateChatServiceImpl.java index 1867a6ee9..9473922f4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PrivateChatServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/chat/impl/PrivateChatServiceImpl.java @@ -38,7 +38,6 @@ import org.springframework.stereotype.Service; import java.time.Duration; import java.util.Date; -import java.util.concurrent.TimeUnit; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/FamilyDiamondSettlementService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/FamilyDiamondSettlementService.java index 2a4d98292..d8e98bea7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/FamilyDiamondSettlementService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/FamilyDiamondSettlementService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.clan; import com.accompany.business.model.UserPurse; - import com.accompany.business.model.family.FamilyMember; import com.accompany.business.model.family.FamilyMemberDiamondSettlementRecord; import com.accompany.business.mybatismapper.UserPurseMapper; @@ -23,7 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanServiceImpl.java index 87d831cc4..cbcac34f1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanServiceImpl.java @@ -28,7 +28,6 @@ import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.clan.*; import com.accompany.business.vo.hall.HallVo; import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityBaseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityBaseService.java index e1d022cf4..b970983d1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityBaseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/CommunityBaseService.java @@ -1,22 +1,19 @@ package com.accompany.business.service.community; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users;; -import com.accompany.core.service.base.BaseService; import com.accompany.business.service.user.UsersService; -import com.accompany.sharding.model.DynamicComment; -import com.accompany.community.condition.DynamicCommentCondition; -import com.accompany.community.condition.DynamicResCondition; -import com.accompany.community.constant.CommentStatusEnum; -import com.accompany.community.constant.DynamicStatusEnum; -import com.accompany.community.entity.Dynamic; -import com.accompany.community.entity.DynamicRes; -import com.accompany.community.service.IDynamicCommentService; -import com.accompany.community.service.IDynamicResService; -import com.accompany.community.service.IDynamicService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.StringUtils; +import com.accompany.community.condition.DynamicCommentCondition; +import com.accompany.community.constant.CommentStatusEnum; +import com.accompany.community.constant.DynamicStatusEnum; +import com.accompany.community.entity.Dynamic; +import com.accompany.community.service.IDynamicCommentService; +import com.accompany.community.service.IDynamicResService; +import com.accompany.community.service.IDynamicService; +import com.accompany.core.exception.ServiceException; +import com.accompany.core.service.base.BaseService; +import com.accompany.sharding.model.DynamicComment; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +21,8 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; +; + /** * Created By LeeNana on 2019/11/13. */ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java index 5f458cd52..352d5599a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java @@ -1,13 +1,13 @@ package com.accompany.business.service.community; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.accompany.common.constant.Constant; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.condition.DynamicLikeCondition; import com.accompany.community.constant.LikeStatusEnum; import com.accompany.community.entity.DynamicLike; import com.accompany.community.entity.dto.LikeStatDto; import com.accompany.community.service.IDynamicLikeService; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicReadService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicReadService.java index ff8413b80..55d5e89ba 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicReadService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicReadService.java @@ -1,9 +1,9 @@ package com.accompany.business.service.community; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.condition.DynamicReadCondition; import com.accompany.community.entity.dto.ReadStatDto; import com.accompany.community.service.IDynamicReadService; -import com.accompany.common.utils.DateTimeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicResService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicResService.java index 685fb5e97..ab2790599 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicResService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicResService.java @@ -1,12 +1,12 @@ package com.accompany.business.service.community; -import com.accompany.core.util.StringUtils; -import com.google.gson.reflect.TypeToken; +import com.accompany.common.redis.RedisKey; import com.accompany.community.condition.DynamicResCondition; import com.accompany.community.entity.DynamicRes; import com.accompany.community.service.IDynamicResService; import com.accompany.community.vo.DynamicResVo; -import com.accompany.common.redis.RedisKey; +import com.accompany.core.util.StringUtils; +import com.google.gson.reflect.TypeToken; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java index cd0d3279e..81fe94648 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java @@ -1,10 +1,8 @@ package com.accompany.business.service.community; import cn.hutool.core.util.ObjectUtil; -import com.accompany.business.model.UserExpand; import com.accompany.business.model.UserLevelCharm; import com.accompany.business.model.UserLevelExperience; -import com.accompany.business.model.UserVoice; import com.accompany.business.service.dfa.DfaService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.level.LevelService; @@ -47,8 +45,8 @@ import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.vo.headwear.UserHeadwearVo; -import com.accompany.core.vo.vip.UserVipInfoVO; import com.accompany.core.vo.user.UserNameplateVo; +import com.accompany.core.vo.vip.UserVipInfoVO; import com.accompany.sharding.mapper.DynamicCommentMapper; import com.accompany.world.constant.WorldConstant; import com.accompany.world.entity.World; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicShareService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicShareService.java index a6e6dee35..5fdda7ea6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicShareService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicShareService.java @@ -1,9 +1,9 @@ package com.accompany.business.service.community; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.condition.DynamicShareCondition; import com.accompany.community.entity.dto.ShareStatDto; import com.accompany.community.service.IDynamicShareService; -import com.accompany.common.utils.DateTimeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicSquareService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicSquareService.java index 4b8553cd2..6c77a4cad 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicSquareService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicSquareService.java @@ -40,15 +40,12 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; import org.springframework.util.StopWatch; import javax.annotation.Resource; -import java.io.IOException; import java.util.*; import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicStatService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicStatService.java index b635f994c..c29234117 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicStatService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicStatService.java @@ -1,6 +1,6 @@ package com.accompany.business.service.community; -import com.accompany.sharding.vo.CommentStatDto; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.entity.DynamicStat; import com.accompany.community.entity.dto.DynamicStatDto; import com.accompany.community.entity.dto.LikeStatDto; @@ -8,16 +8,12 @@ import com.accompany.community.entity.dto.ReadStatDto; import com.accompany.community.entity.dto.ShareStatDto; import com.accompany.community.query.DynamicDataStatQuery; import com.accompany.community.service.IDynamicStatService; -import com.accompany.common.utils.DateTimeUtil; +import com.accompany.sharding.vo.CommentStatDto; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * ｛这里添加描述｝ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleBizService.java index f8f14ef76..1bbefe863 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserChatBubbleBizService.java @@ -23,7 +23,6 @@ import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisService; -import com.accompany.core.vo.user.UserNameplateVo; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** *
类描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserHeadwearService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserHeadwearService.java index 7bf6b7cf8..33d2ca40c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserHeadwearService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserHeadwearService.java @@ -4,9 +4,7 @@ import com.accompany.business.event.ActivityOfDayConsumeEvent; import com.accompany.business.message.ActivityOfDayConsumeMessage; import com.accompany.business.model.Headwear; import com.accompany.business.model.UserHeadwear; -import com.accompany.business.model.UserHeadwearExample; import com.accompany.business.model.UserPurse; -import com.accompany.business.mybatismapper.UserHeadwearMapper; import com.accompany.business.mybatismapper.UserHeadwearMapperExpand; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.purse.UserPurseService; @@ -22,9 +20,7 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.base.BaseService; -import com.accompany.core.vo.headwear.UserHeadwearVo; import com.github.pagehelper.PageHelper; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +28,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; @Service @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserInfoCardBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserInfoCardBizService.java index b9e35a034..1f43c0a99 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserInfoCardBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dress/UserInfoCardBizService.java @@ -33,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** *
类描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftRecordService.java index 6a2e40770..65a89539c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftRecordService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.family; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.family.FamilyGiftRecord; import com.accompany.business.model.family.FamilyMember; import com.accompany.business.mybatismapper.family.FamilyGiftRecordMapper; @@ -8,6 +7,7 @@ import com.accompany.business.vo.family.FamilyUserIncomeItemVo; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; +import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftWageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftWageService.java index de684b9af..43c8dbe61 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftWageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyGiftWageService.java @@ -9,7 +9,6 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.List; -import java.util.SortedMap; import java.util.TreeMap; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyIncomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyIncomeService.java index 1a57cecc5..137d982cc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyIncomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyIncomeService.java @@ -3,7 +3,6 @@ package com.accompany.business.service.family; import com.accompany.business.constant.family.FamilyConstant; import com.accompany.business.model.family.FamilyGiftRecord; import com.accompany.business.model.family.FamilyMember; -import com.accompany.business.model.family.FamilyMemberGoldRemainDayRecord; import com.accompany.business.service.room.FamilyMemberRoomMicRecordService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.CycleTimeUtil; @@ -14,13 +13,11 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.sharding.model.FamilyMemberRoomMicRecord; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.math.BigDecimal; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.*; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberViolationService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberViolationService.java index 5b5b3c9bc..15602d676 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberViolationService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberViolationService.java @@ -2,15 +2,9 @@ package com.accompany.business.service.family; import com.accompany.business.model.family.FamilyMemberViolation; import com.accompany.business.mybatismapper.family.FamilyMemberViolationMapper; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.AdminServiceException; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class FamilyMemberViolationService extends ServiceImpl { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberWeekLevelRewardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberWeekLevelRewardService.java index bfeb16e23..3d1790f26 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberWeekLevelRewardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberWeekLevelRewardService.java @@ -4,7 +4,6 @@ package com.accompany.business.service.family; import com.accompany.business.model.UserPurse; import com.accompany.business.model.family.FamilyMemberWeekLevelReward; import com.accompany.business.model.family.FamilyMemberWeekLevelRewardRecord; -import com.accompany.business.model.guild.GuildMemberWeekLevelReward; import com.accompany.business.mybatismapper.family.FamilyMemberWeekLevelRewardMapper; import com.accompany.business.mybatismapper.family.FamilyMemberWeekLevelRewardRecordMapper; import com.accompany.business.service.SendSysMsgService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyRelationService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyRelationService.java index 68587ff08..fcd30dd57 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyRelationService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyRelationService.java @@ -11,7 +11,6 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.base.SpringContextHolder; -import com.accompany.core.exception.AdminServiceException; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.util.PartitionUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyService.java index 5f85d5db6..4a06e5984 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.family; import com.accompany.business.model.family.Family; import com.accompany.business.mybatismapper.family.FamilyMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyWageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyWageService.java index 58876bcce..4c2b83f78 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyWageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyWageService.java @@ -21,8 +21,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawOpenBoxAdapter.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawOpenBoxAdapter.java index f4fa4f8b2..bad72e8ec 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawOpenBoxAdapter.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawOpenBoxAdapter.java @@ -10,7 +10,6 @@ import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.findlove.*; import com.accompany.business.vo.openbox.BoxParentRankVo; -import com.accompany.business.vo.openbox.BoxRankVo; import com.accompany.business.vo.openbox.OpenBoxResult; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; @@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawService.java index 14e9714ed..fda231f31 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawService.java @@ -3,7 +3,7 @@ package com.accompany.business.service.findlove; import com.accompany.business.vo.findlove.*; import com.accompany.common.device.DeviceInfo; -import java.util.*; +import java.util.List; /** * Created by 恒仔 on 2023/3/26. diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawServiceImpl.java index ac5dfdcd8..3845226d4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveDrawServiceImpl.java @@ -13,15 +13,15 @@ import com.accompany.business.service.level.LevelService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.user.UserBackpackService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.utils.AppVersionUtil; -import com.accompany.core.base.DeviceInfoContextHolder; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.vo.findlove.*; import com.accompany.common.constant.Constant; +import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; +import com.accompany.common.utils.AppVersionUtil; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.base.DeviceInfoContextHolder; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveMsgService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveMsgService.java index 0a523c75d..73f93829e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveMsgService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveMsgService.java @@ -6,26 +6,25 @@ import com.accompany.business.dto.findlove.FindLoveDrawWarningConfig; import com.accompany.business.model.findlove.FindLoveDrawPoolItem; import com.accompany.business.model.findlove.FindLoveDrawRecord; import com.accompany.business.mybatismapper.findlove.FindLoveDrawRecordMapper; -import com.accompany.business.vo.message.FloatingMessageTemplate; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; -import com.accompany.common.config.SystemConfig; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.findlove.FindLoveDrawBroadCastVo; import com.accompany.business.vo.findlove.FindLoveDrawPushMsg; +import com.accompany.common.config.SystemConfig; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.push.MarkdownMessage; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSON; import lombok.SneakyThrows; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLovePoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLovePoolService.java index b91cd7c4b..8480a0fb5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLovePoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLovePoolService.java @@ -4,11 +4,11 @@ import com.accompany.business.dto.findlove.FindLoveDrawConfigDto; import com.accompany.business.model.findlove.FindLoveDrawPoolItem; import com.accompany.business.model.findlove.FindLoveDrawRecord; import com.accompany.business.mybatismapper.findlove.FindLoveDrawPoolItemMapper; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.vo.findlove.FindLoveDrawPoolItemRuleVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/FirstPageBannerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/FirstPageBannerService.java index 0316082d2..5620e2a07 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/FirstPageBannerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/FirstPageBannerService.java @@ -16,7 +16,6 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.AppVersionUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/SecondPageBannerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/SecondPageBannerService.java index ff5f6e836..aaa7bea96 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/SecondPageBannerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/firstpage/SecondPageBannerService.java @@ -18,7 +18,6 @@ import com.accompany.common.utils.StringUtils; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansRoomService.java index 121e6c849..c506f63a5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansRoomService.java @@ -2,7 +2,10 @@ package com.accompany.business.service.follow; import com.accompany.business.model.FansRoom; import com.accompany.business.mybatismapper.FansRoomMapper; -import com.accompany.business.param.neteasepush.*; +import com.accompany.business.param.neteasepush.Body; +import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; +import com.accompany.business.param.neteasepush.Option; +import com.accompany.business.param.neteasepush.Payload; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.room.RoomService; import com.accompany.common.config.SystemConfig; @@ -25,7 +28,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.HashMap; +import java.util.List; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java index 053f6fbea..bf5163b6d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java @@ -4,22 +4,18 @@ import cn.hutool.core.util.ObjectUtil; import com.accompany.business.dto.LikeEventDto; import com.accompany.business.dto.fans.FanFollowLimitConfigDTO; import com.accompany.business.event.LikeEvent; -import com.accompany.business.event.msg.UserChatMsgEvent; import com.accompany.business.model.Fans; import com.accompany.business.model.FansRoom; import com.accompany.business.mybatismapper.FansMapper; import com.accompany.business.mybatismapper.FansMapperExpand; import com.accompany.business.mybatismapper.FansRoomMapper; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.level.LevelService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.room.UserInOutRoomRecordService; import com.accompany.business.service.user.UserInRoomService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.util.VipUtil; import com.accompany.business.vo.RoomVo; import com.accompany.business.vo.follow.FansFollowVo; @@ -28,11 +24,14 @@ import com.accompany.business.vo.follow.FriendVo; import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.BaseNetEaseRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.common.utils.UUIDUtil; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/BaseGameMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/BaseGameMessageService.java index df5525e48..ca8296189 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/BaseGameMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/game/BaseGameMessageService.java @@ -18,10 +18,8 @@ import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.I18NMessageSourceUtil; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.task.TaskExecutor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java index 10128f2cd..6b66af240 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamepartner/GamePartnerOrderService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.gamepartner; import com.accompany.business.model.gamepartner.GamePartnerOrder; import com.accompany.business.vo.gamepartner.GamePartnerOrderVo; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.math.BigDecimal; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftCompoundService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftCompoundService.java index cb6aed698..b86cb1f78 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftCompoundService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftCompoundService.java @@ -7,7 +7,6 @@ import com.accompany.business.model.GiftCompoundReward; import com.accompany.business.model.GiftCompoundRewardPool; import com.accompany.business.param.BatchGiftParam; import com.accompany.business.param.GiftCompoundParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.room.UserInOutRoomRecordService; @@ -17,6 +16,7 @@ import com.accompany.business.vo.UserBackpackVo; import com.accompany.business.vo.gift.CompoundGiftVo; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java index eaa888108..155a08d95 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftEarnAllotService.java @@ -5,7 +5,6 @@ import com.accompany.business.dto.GiftEarnAllot; import com.accompany.business.dto.GiftEarnAllotConfigDto; import com.accompany.business.dto.GiftEarnAllotFamilyConfigDto; import com.accompany.business.dto.GiftEarnAllotGuildConfigDto; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.Hall; import com.accompany.business.model.clan.Clan; import com.accompany.business.model.clan.ClanAccountAssociate; @@ -29,6 +28,7 @@ import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.partition.PartitionInfoService; +import com.accompany.sharding.model.GiftSendRecord; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftMessageService.java index cf15c0d10..db6f6b218 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftMessageService.java @@ -7,7 +7,6 @@ import com.accompany.business.event.RoomPKEvent; import com.accompany.business.message.ActivityOfDayConsumeMessage; import com.accompany.business.message.GiftMessage; import com.accompany.business.model.Gift; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.vip.VipAuthItem; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.vip.VipAuthItemService; @@ -17,6 +16,7 @@ import com.accompany.common.redis.RedisKey; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.service.base.BaseService; import com.accompany.core.vo.vip.VipBaseInfoVO; +import com.accompany.sharding.model.GiftSendRecord; import com.alibaba.fastjson.JSON; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendRecordService.java index 39320276c..735b21731 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendRecordService.java @@ -1,14 +1,14 @@ package com.accompany.business.service.gift; -import com.accompany.sharding.mapper.GiftSendRecordMapper; -import com.accompany.sharding.model.GiftSendRecord; -import com.accompany.sharding.vo.GiftSendRecordStatistics; -import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.common.constant.Constant; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.util.StringUtils; +import com.accompany.sharding.mapper.GiftSendRecordMapper; +import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; +import com.accompany.sharding.model.GiftSendRecord; +import com.accompany.sharding.vo.GiftSendRecordStatistics; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java index b166a9d6a..fa4c7d4a0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java @@ -22,7 +22,10 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.OptionalDouble; import java.util.stream.Collectors; @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/LuckyBagSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/LuckyBagSendService.java index 9cf457a99..cda6838c1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/LuckyBagSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/LuckyBagSendService.java @@ -5,9 +5,7 @@ import com.accompany.business.event.LuckyBagMessageEvent; import com.accompany.business.message.LuckyBagMessage; import com.accompany.business.model.Gift; import com.accompany.business.model.luckybag.LuckyBagRecord; -import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; import com.accompany.business.service.AccountLoginRecordService; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.luckybag.LuckyBagRecordService; @@ -16,7 +14,7 @@ import com.accompany.business.service.user.UsersService; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; import com.accompany.core.model.Users; @@ -28,7 +26,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java index f28e4dfb4..a533ffff2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondStatisticsDayService.java @@ -6,9 +6,6 @@ import com.accompany.business.vo.guild.GuildDiamondStatisticsDayVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Date; -import java.util.List; - /** * 用户公会统计按天 服务类 * diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondWageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondWageService.java index aa3a116cb..e9beaa41e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondWageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildDiamondWageService.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.List; import java.util.Map; import java.util.TreeMap; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java index c8818e815..20a87e70e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.guild; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.guild.GuildGiftRecord; import com.accompany.business.model.guild.GuildMember; import com.accompany.business.mybatismapper.guild.GuildGiftRecordMapper; @@ -12,6 +11,7 @@ import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; +import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java index 2affbfe7c..10679413f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildIncomeService.java @@ -20,7 +20,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java index b8521552c..4f41d31f2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java @@ -1,7 +1,10 @@ package com.accompany.business.service.guild; import com.accompany.business.constant.guild.GuildConstant; -import com.accompany.business.model.guild.*; +import com.accompany.business.model.guild.Guild; +import com.accompany.business.model.guild.GuildAuth; +import com.accompany.business.model.guild.GuildMember; +import com.accompany.business.model.guild.GuildOperateRecord; import com.accompany.business.service.level.LevelService; import com.accompany.business.service.netease.YidunCheckUtil; import com.accompany.business.service.user.UsersService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberDiamondStatisticsService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberDiamondStatisticsService.java index cea479dee..0895564c2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberDiamondStatisticsService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberDiamondStatisticsService.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildRankService.java index 673e3f14d..b31bc01ab 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildRankService.java @@ -22,7 +22,6 @@ import java.time.DayOfWeek; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjuster; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java index 6377128ec..f5cc2e928 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildService.java @@ -4,7 +4,6 @@ import com.accompany.business.model.guild.Guild; import com.accompany.business.mybatismapper.guild.GuildMapper; import com.accompany.business.vo.guild.AgencyOwnerVo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.swagger.models.auth.In; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java index bf518b882..e4cd307b0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdOperateService.java @@ -34,7 +34,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.*; +import java.util.Arrays; +import java.util.Optional; @Service public class GuildUsdOperateService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawBizService.java index 0b9539b47..b3f9a97c8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawBizService.java @@ -1,8 +1,8 @@ package com.accompany.business.service.guild; import com.accompany.business.constant.guild.GuildWithdrawAccountTypeEnum; -import com.accompany.business.model.guild.GuildUsdWithdrawRecord; import com.accompany.business.model.guild.GuildUsdWithdrawAccount; +import com.accompany.business.model.guild.GuildUsdWithdrawRecord; import com.accompany.business.mybatismapper.guild.GuildUsdWithdrawRecordMapper; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java index 127b881a6..04af43a92 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdWithdrawRecordService.java @@ -2,8 +2,8 @@ package com.accompany.business.service.guild; import com.accompany.business.constant.guild.GuildConstant; import com.accompany.business.constant.guild.GuildWithdrawAccountTypeEnum; -import com.accompany.business.model.guild.GuildUsdWithdrawRecord; import com.accompany.business.model.guild.GuildUsdWithdrawAccount; +import com.accompany.business.model.guild.GuildUsdWithdrawRecord; import com.accompany.business.mybatismapper.guild.GuildUsdWithdrawRecordMapper; import com.accompany.common.constant.Constant; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SSGuildService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SSGuildService.java index 1b82ed597..f40c01d56 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SSGuildService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SSGuildService.java @@ -12,8 +12,6 @@ import com.accompany.business.service.activity.h5.ActivityH5LevelAwardService; import com.accompany.business.service.activity.h5.ActivityH5LevelExpService; import com.accompany.business.service.activity.h5.ActivityRankRuleService; import com.accompany.business.service.level.LevelService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.activity.h5.ActivityDiffExpVo; import com.accompany.business.vo.activity.h5.ActivityExpVo; @@ -23,7 +21,6 @@ import com.accompany.business.vo.guild.GuildSSRankDetailVo; import com.accompany.business.vo.guild.GuildSSRankVo; import com.accompany.common.result.BusiResult; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PartitionInfo; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordService.java index 56180fdaa..c25d5c993 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordService.java @@ -1,14 +1,12 @@ package com.accompany.business.service.guild; import com.accompany.business.model.guild.SsMonthCoinRecord; -import com.accompany.business.vo.guild.GuildCycleDateVo; import com.accompany.business.vo.guild.SsMonthCoinRecordVo; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; import com.baomidou.mybatisplus.extension.service.IService; import java.math.BigDecimal; -import java.util.List; /** * SS金币发放明细表 服务类 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallGiftRecordService.java index 00d6023ec..b33ea9733 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallGiftRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallGiftRecordService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.hall; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.HallGiftRecord; import com.accompany.business.model.HallMember; import com.accompany.business.model.clan.Clan; @@ -8,6 +7,7 @@ import com.accompany.business.mybatismapper.HallGiftRecordMapper; import com.accompany.business.service.clan.ClanService; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; +import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomGiftRecordService.java index e92ecdac1..be850b0b9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomGiftRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomGiftRecordService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.hall; -import com.accompany.sharding.model.GiftSendRecord; import com.accompany.business.model.HallMember; import com.accompany.business.model.HallRoomGiftRecord; import com.accompany.business.model.clan.Clan; @@ -8,6 +7,7 @@ import com.accompany.business.mybatismapper.HallRoomGiftRecordMapper; import com.accompany.business.service.clan.ClanService; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; +import com.accompany.sharding.model.GiftSendRecord; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomSerialService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomSerialService.java index 147288bf1..c72b41656 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomSerialService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallRoomSerialService.java @@ -4,8 +4,8 @@ import com.accompany.business.model.Hall; import com.accompany.business.model.HallMember; import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.RoomVo; -import com.accompany.sharding.vo.RoomSerialVo; import com.accompany.core.service.base.BaseService; +import com.accompany.sharding.vo.RoomSerialVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java index 1d0fa2444..2bb42b5a7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java @@ -17,13 +17,13 @@ import com.accompany.business.model.hall.HallSuperManage; import com.accompany.business.model.hall.HallSuperManageRoom; import com.accompany.business.mybatismapper.hall.HallSuperManageBizMapper; import com.accompany.business.param.hall.SetHallSuperManageParams; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.clan.ClanService; import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.hall.ClanSuperManageListVO; import com.accompany.business.vo.hall.HallForSuperManageSetVO; import com.accompany.business.vo.hall.HallSuperManageSearchResVO; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeIndexService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeIndexService.java index e5b1db082..28a31d0d2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeIndexService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeIndexService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.home; import com.accompany.business.vo.home.HomeUserVo; import com.accompany.business.vo.home.NewFriendVo; -import com.accompany.business.vo.home.PlayRoomVo; import java.util.List; @@ -13,13 +12,6 @@ import java.util.List; */ public interface HomeIndexService { - /** - * 热门推荐 - * - * @return - */ - List hotRoom(); - /** * 发现新朋友 * diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeRankService.java index fdded4117..d2fb8901a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeRankService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.home; import com.accompany.business.common.vo.ActivityUserVo; -import com.accompany.business.service.rank.IRank; import com.accompany.business.service.rank.RankServiceFactory; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeService.java index 8f2322986..86d45b2f8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeService.java @@ -1,30 +1,21 @@ package com.accompany.business.service.home; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.accompany.business.dto.HomeRoomListV2SysConf; import com.accompany.business.dto.QueueDTO; import com.accompany.business.dto.QueueListResponseDTO; import com.accompany.business.dto.QueueValueDTO; import com.accompany.business.event.RoomCacheDealEvent; -import com.accompany.business.model.miniGame.MiniGame; -import com.accompany.business.model.miniGame.MiniGameSwitchRecord; import com.accompany.business.model.roomtab.RoomTab; import com.accompany.business.model.roomtab.RoomTabHome; -import com.accompany.business.model.roomtab.RoomTabMap; import com.accompany.business.mybatismapper.RoomTabHomeMapper; -import com.accompany.business.service.homeV2.HomeRoomPoolService; -import com.accompany.business.service.room.QueryRoomService; import com.accompany.business.service.firstpage.FirstPageBannerService; -import com.accompany.business.service.home.decorator.CrossPkIngRoomDecorator; -import com.accompany.business.service.home.decorator.MicUsersRoomDecorator; -import com.accompany.business.service.home.decorator.PlayRoomDecorateChain; -import com.accompany.business.service.home.decorator.UsersRoomDecorator; +import com.accompany.business.service.homeV2.HomeRoomPoolService; import com.accompany.business.service.miniGame.MiniGameService; import com.accompany.business.service.miniGame.MiniGameSwitchRecordService; import com.accompany.business.service.nameplate.UserNameplateService; import com.accompany.business.service.rank.RankService; +import com.accompany.business.service.room.QueryRoomService; import com.accompany.business.service.room.RoomRankService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.roomtab.RoomTabHomeService; @@ -34,29 +25,21 @@ import com.accompany.business.service.user.UserBlackRecordService; import com.accompany.business.service.user.UserInRoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.MicUserVo; -import com.accompany.business.vo.RankParentVo; -import com.accompany.business.vo.RankVo; import com.accompany.business.vo.RoomVo; -import com.accompany.business.vo.firstpage.FirstPageBannerVo; import com.accompany.business.vo.home.DynamicVo; import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.room.PermitRoomHourRankVo; import com.accompany.business.vo.roomtab.HomeRoomTabVo; import com.accompany.business.vo.roomtab.TopRoomTabHomeVo; -import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.AppVersionUtil; import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.GsonUtil; import com.accompany.community.condition.DynamicCondition; import com.accompany.community.constant.DynamicStatusEnum; import com.accompany.community.entity.Dynamic; import com.accompany.community.service.IDynamicLikeService; import com.accompany.community.service.IDynamicService; -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; @@ -68,9 +51,6 @@ import com.accompany.core.vo.user.UserNameplateVo; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.gson.reflect.TypeToken; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -79,7 +59,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import java.util.*; -import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; /** @@ -432,362 +411,6 @@ public class HomeService extends BaseService { } } - - /** - * 首页改版推荐房间，4.0.0版本开始使用 - * - * @return - */ - public List getRoomTabMapListV2(Long tabId, Integer pageNum, Integer pageSize, Long uid, DeviceInfo deviceInfo) throws Exception { - if (ObjectUtil.isNull(pageNum)) pageNum = 1; - if (ObjectUtil.isNull(pageSize)) pageSize = 30; - if (tabId == null) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(RoomTab::getIsHomeRecommend, true); - RoomTab roomTab = roomTabService.getBaseMapper().selectOne(queryWrapper); - if (ObjectUtil.isNull(roomTab)) throw new ServiceException(BusiStatus.NO_HOMEPAGE_RECOMMENDATION_TAB_SET); - tabId = roomTab.getId(); - } - List topRoomTabHomeVos = new ArrayList<>(); - ; - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(RoomTabHome::getTabId, tabId); - List list = roomTabHomeService.list(wrapper); - if (CollectionUtils.isEmpty(list)) { - return topRoomTabHomeVos; - } - - // 过滤屏蔽房间 - List blackIdList = userBlackRecordService.getBlackIdList(uid, Constant.UserBlackType.room); - List roomUidList = list.stream().map(RoomTabHome::getRoomUid).collect(Collectors.toList()); - List roomList = roomService.getRoomListByUids(roomUidList); - List usersList = usersBaseService.getUsersListByUids(roomUidList); - - Map roomMap = roomList.stream().collect(Collectors.toMap(Room::getUid, room -> room)); - Map userMap = usersList.stream().collect(Collectors.toMap(Users::getUid, users -> users)); - - Users u = usersService.getUsersByUid(uid); - - Date currentDate = new Date(); - list.forEach(roomTabHome -> { - // 过滤屏蔽房间 - if (CollectionUtils.isNotEmpty(blackIdList) && blackIdList.contains(roomTabHome.getRoomUid())) return; - TopRoomTabHomeVo topRoomTabHomeVo = new TopRoomTabHomeVo(); - Room room = roomMap.get(roomTabHome.getRoomUid()); - Users users = userMap.get(roomTabHome.getRoomUid()); - if (room == null) { - return; - } - - if (!u.getPartitionId().equals(room.getPartitionId())) { - return; - } - - BeanUtils.copyProperties(roomTabHome, topRoomTabHomeVo); - //已置顶并且置顶时间未失效 - boolean isTop = roomTabHome.getIsTop() && ObjectUtil.isNotNull(roomTabHome.getTopStart()) && ObjectUtil.isNotNull(roomTabHome.getTopEnd()) - && currentDate.compareTo(roomTabHome.getTopStart()) >= 0 - && currentDate.compareTo(roomTabHome.getTopEnd()) <= 0; - if (!isTop) { - topRoomTabHomeVo.setIsTop(false); - topRoomTabHomeVo.setSeq(0); - } - BeanUtils.copyProperties(room, topRoomTabHomeVo); - topRoomTabHomeVo.setAvatar(users.getAvatar()); - topRoomTabHomeVo.setOnlineNum(room.getOnlineNum()); - topRoomTabHomeVo.setErbanNo(users.getErbanNo()); - //麦上人数 - String roomMicInfo = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(room.getUid())); - if (StringUtils.isNotEmpty(roomMicInfo) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(roomMicInfo)) { - PlayRoomVo playRoomVo = gson.fromJson(roomMicInfo, PlayRoomVo.class); - topRoomTabHomeVo.setOnMicNum(playRoomVo.getMicUserCount()); - } - topRoomTabHomeVo.setTagPict(null); - topRoomTabHomeVo.setUid(roomTabHome.getRoomUid()); - topRoomTabHomeVos.add(topRoomTabHomeVo); - }); - //进行过滤 - Integer onMicNum = Integer.valueOf(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.RECOM_NOT_TOP_MIC_NUM, String.valueOf(Constant.BigGooseConstant.home_not_top_default_mic_num))); - List tabHomeVoList = topRoomTabHomeVos.stream().filter(tabHomeVo -> { - Room room = roomMap.get(tabHomeVo.getRoomUid()); - if (ObjectUtil.isNull(room) || StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; - if (!tabHomeVo.getIsTop()) { - // 非置顶房间需要判断麦上人数是否符合要求 - if (ObjectUtil.isNull(tabHomeVo.getOnMicNum()) || tabHomeVo.getOnMicNum() < onMicNum) return false; - // 过滤屏蔽房间 - return !CollectionUtils.isNotEmpty(blackIdList) || !blackIdList.contains(tabHomeVo.getRoomUid()); - } - return true; - }).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(tabHomeVoList)) return tabHomeVoList; - //排序 - tabHomeVoList = tabHomeVoList.stream().sorted((x, y) -> { - if (x.getIsTop() == y.getIsTop()) { - if (x.getIsTop()) { - return y.getId().compareTo(x.getId()); - } else { - //随机排序 - ThreadLocalRandom tRandom = ThreadLocalRandom.current(); - if (tRandom.nextBoolean()) return 1; - else return -1; - } - } else { - if (x.getIsTop()) return -1; - else return 1; - } - }).collect(Collectors.toList()); - tabHomeVoList = this.subListByPage(pageNum, pageSize, tabHomeVoList); - this.checkIsCrossPking(tabHomeVoList, this::checkTopRoomTabIsCrossPking); - //装饰 - PlayRoomDecorateChain decorateChain = new PlayRoomDecorateChain<>( - new UsersRoomDecorator<>(new MicUsersRoomDecorator<>(new CrossPkIngRoomDecorator<>(), 0, 5), roomList, usersList) - ); - decorateChain.decorate(tabHomeVoList); - //房间小时榜top1-3->随机 - List top3 = roomRankService.listRankVo(0L, 3L, new Date()); - if (CollectionUtil.isNotEmpty(top3)) { - for (PermitRoomHourRankVo.PermitRoomHourRankListVo rank : top3) { - Long rankUid = rank.getUid(); - for (TopRoomTabHomeVo roomTabHome : tabHomeVoList) { - if (rankUid.equals(roomTabHome.getUid())) { - roomTabHome.setIsHourTop1(Constant.Yes1No0.YES); - break; - } - } - } - } - //设置周榜top1标识 - if (UidContextHolder.get() != null) { - RankParentVo parent = rankService.getTotalRank(UidContextHolder.get(), RedisKey.otaku_rank.name(), Constant.RankDatetype.week, 1, 1); - if (parent != null) { - List ranks = parent.getRankVoList(); - if (CollectionUtil.isNotEmpty(ranks)) { - RankVo rank = ranks.get(0); - for (TopRoomTabHomeVo roomTabHome : tabHomeVoList) { - if (roomTabHome.getUid().equals(rank.getUid())) { - roomTabHome.setIsWeekTop1(Constant.Yes1No0.YES); - break; - } - } - } - } - } - return tabHomeVoList; - } - - /** - * 4.0.0版本开始使用:热门房间 - * - * @return - */ - public List hotRoom(Long uid, DeviceInfo deviceInfo) { - List playRooms = homeIndexService.hotRoom(); - List roomTabHomes = roomTabHomeMapper.selectList(Wrappers.emptyWrapper()); - if (CollectionUtil.isNotEmpty(roomTabHomes)) { - playRooms.removeIf(v1 -> roomTabHomes.stream().filter(roomTabHome -> !roomTabHome.getIsShow()).anyMatch(v2 -> v1.getUid().equals(v2.getRoomUid()))); - } - return playRooms; - } - - /** - * 首页改版-派对tab，4.0.0版本开始使用 - * - * @return - */ - public List getRoomTabHomeListV2(Integer tabId, Integer pageNum, Integer pageSize, Long uid, DeviceInfo deviceInfo) throws Exception { - RoomTab roomTab = roomTabService.getById(tabId); - if (roomTab == null) { - return Collections.emptyList(); - } - Users u; - if (uid != null) { - u = usersService.getUsersByUid(uid); - } else { - u = null; - } - List topRoomTabVoList = Lists.newArrayList(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(RoomTabMap::getTabId, tabId); - List list = roomTabMapService.list(wrapper); - if (CollectionUtil.isNotEmpty(list)) { - // 过滤屏蔽房间 - List blackIdList = userBlackRecordService.getBlackIdList(uid, Constant.UserBlackType.room); - List playRoomVoList = new ArrayList<>(); - list = list.stream().filter(roomTabMap -> { - Room room = roomService.getRoomByUid(roomTabMap.getRoomUid()); - if (ObjectUtil.isNull(room)) return false; - if (u != null && !u.getPartitionId().equals(room.getPartitionId())) { - return false; - } - if (roomTabMap.getIsTop()) return true; - if (StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; - String playRoomVoStr = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomTabMap.getRoomUid())); - if (StringUtils.isEmpty(playRoomVoStr) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(playRoomVoStr)) - return false; - PlayRoomVo playRoomVo = gson.fromJson(playRoomVoStr, PlayRoomVo.class); - if (ObjectUtil.isNull(playRoomVo.getMicUserCount())) return false; - if (playRoomVo.getMicUserCount() < 1) return false; - // 过滤屏蔽房间 - if (CollectionUtils.isNotEmpty(blackIdList) && blackIdList.contains(playRoomVo.getUid())) return false; - playRoomVoList.add(playRoomVo); - return true; - }).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(list)) { - Map playRoomVoMap = Maps.uniqueIndex(playRoomVoList, PlayRoomVo::getUid); - List roomUidList = list.stream().map(RoomTabMap::getRoomUid).collect(Collectors.toList()); - List roomList = roomService.getRoomListByUids(roomUidList); - Map roomMap = roomList.stream().collect(Collectors.toMap(Room::getUid, room -> room)); - List usersList = usersBaseService.getUsersListByUids(roomUidList); - Map userMap = usersList.stream().collect(Collectors.toMap(Users::getUid, users -> users)); - Date now = new Date(); - for (RoomTabMap roomTabMap : list) { - Date topStart = roomTabMap.getTopStart(); - Date topEnd = roomTabMap.getTopEnd(); - if (topStart != null && topStart.after(now)) { - roomTabMap.setIsTop(false); - } - if (topEnd != null && topEnd.before(now)) { - roomTabMap.setIsTop(false); - } - TopRoomTabHomeVo topRoomTabHomeVo = new TopRoomTabHomeVo(); - Room room = roomMap.get(roomTabMap.getRoomUid()); - Users users = userMap.get(roomTabMap.getRoomUid()); - if (ObjectUtil.isNull(room) || ObjectUtil.isNull(users)) continue; - if (u != null && !u.getPartitionId().equals(room.getPartitionId())) continue; - // 过滤屏蔽房间 - if (CollectionUtils.isNotEmpty(blackIdList) && blackIdList.contains(roomTabMap.getRoomUid())) { - continue; - } - BeanUtils.copyProperties(roomTabMap, topRoomTabHomeVo); - BeanUtils.copyProperties(room, topRoomTabHomeVo); - topRoomTabHomeVo.setAvatar(users.getAvatar()); - topRoomTabHomeVo.setTitle(room.getTitle()); - topRoomTabHomeVo.setRoomTag(room.getRoomTag()); - topRoomTabHomeVo.setTagPict(room.getTagPict()); - topRoomTabHomeVo.setOnlineNum(ObjectUtil.isNull(room.getOnlineNum()) ? 0 : room.getOnlineNum()); - topRoomTabHomeVo.setErbanNo(users.getErbanNo()); - topRoomTabHomeVo.setPartitionId(room.getPartitionId()); - if (roomTabMap.getIsTop()) { - String playRoomVoStr = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomTabMap.getRoomUid())); - if (StringUtils.isEmpty(playRoomVoStr) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(playRoomVoStr)) { - topRoomTabHomeVo.setOnMicNum(0); - topRoomTabHomeVo.setMicUsers(Collections.emptyList()); - } else { - PlayRoomVo playRoomVo = gson.fromJson(playRoomVoStr, PlayRoomVo.class); - topRoomTabHomeVo.setOnMicNum(ObjectUtil.isNull(playRoomVo.getMicUserCount()) ? 0 : playRoomVo.getMicUserCount()); - topRoomTabHomeVo.setMicUsers(CollectionUtils.isEmpty(playRoomVo.getMicUsers()) ? Collections.emptyList() : playRoomVo.getMicUsers()); - } - } else { - PlayRoomVo playRoomVo = Optional.ofNullable(playRoomVoMap.get(roomTabMap.getRoomUid())).orElse(new PlayRoomVo()); - topRoomTabHomeVo.setOnMicNum(ObjectUtil.isNull(playRoomVo.getMicUserCount()) ? 0 : playRoomVo.getMicUserCount()); - topRoomTabHomeVo.setMicUsers(CollectionUtils.isEmpty(playRoomVo.getMicUsers()) ? Collections.emptyList() : playRoomVo.getMicUsers()); - } - String roomMicInfoStr = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomTabMap.getRoomUid())); - if (StrUtil.isEmpty(roomMicInfoStr) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(roomMicInfoStr)) { - continue; - } - PlayRoomVo playRoom = GsonUtil.getDefGson().fromJson(roomMicInfoStr, PlayRoomVo.class); - List micUsers = playRoom.getMicUsers(); - topRoomTabHomeVo.setMicUsers(micUsers); - topRoomTabHomeVo.setMicUserCount(micUsers.size()); - topRoomTabVoList.add(topRoomTabHomeVo); - } - //排序 - topRoomTabVoList = topRoomTabVoList.stream().sorted((x, y) -> { - if (x.getIsTop() == y.getIsTop()) { - if (x.getSeq().equals(y.getSeq())) { - if (x.getOnlineNum().equals(y.getOnlineNum())) return y.getId().compareTo(x.getId()); - else return y.getOnlineNum().compareTo(x.getOnlineNum()); - } else { - return y.getSeq().compareTo(x.getSeq()); - } - } else { - if (x.getIsTop()) return -1; - else return 1; - } - }).collect(Collectors.toList()); - } - } - if (roomTab.getIsHomeRecommend() != null && roomTab.getIsHomeRecommend()) { - List playRooms = hotRoom(UidContextHolder.get(), DeviceInfoContextHolder.get()); - if (CollectionUtil.isNotEmpty(playRooms)) { - for (PlayRoomVo playRoom : playRooms) { - if (u != null && !u.getPartitionId().equals(playRoom.getPartitionId())) continue; - TopRoomTabHomeVo topRoomTabHomeVo = new TopRoomTabHomeVo(); - BeanUtils.copyProperties(playRoom, topRoomTabHomeVo); - if (topRoomTabVoList.stream().noneMatch(v -> v.getUid().equals(playRoom.getUid()))) { - topRoomTabVoList.add(topRoomTabHomeVo); - } - } - } - } else { - //房间小时榜top1-3->随机 - List top3 = roomRankService.listRankVo(0L, 3L, new Date()); - if (CollectionUtil.isNotEmpty(top3)) { - for (PermitRoomHourRankVo.PermitRoomHourRankListVo rank : top3) { - Long rankUid = rank.getUid(); - for (TopRoomTabHomeVo roomTabHome : topRoomTabVoList) { - if (rankUid.equals(roomTabHome.getUid())) { - roomTabHome.setIsHourTop1(Constant.Yes1No0.YES); - break; - } - } - } - } - //设置周榜top1标识 - if (UidContextHolder.get() != null) { - RankParentVo parent = rankService.getTotalRank(UidContextHolder.get(), RedisKey.otaku_rank.name(), Constant.RankDatetype.week, 1, 1); - if (parent != null) { - List ranks = parent.getRankVoList(); - if (CollectionUtil.isNotEmpty(ranks)) { - RankVo rank = ranks.get(0); - for (TopRoomTabHomeVo roomTabHome : topRoomTabVoList) { - if (roomTabHome.getUid().equals(rank.getUid())) { - roomTabHome.setIsWeekTop1(Constant.Yes1No0.YES); - break; - } - } - } - } - } - } - List roomUidList = topRoomTabVoList.stream().map(TopRoomTabHomeVo::getRoomUid).distinct().collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(roomUidList)) { - List roomList = roomService.getRoomListByUids(roomUidList); - List usersList = usersBaseService.getUsersListByUids(roomUidList); - topRoomTabVoList = this.subListByPage(pageNum, pageSize, topRoomTabVoList); - topRoomTabVoList.forEach(topRoomTabHomeVo -> { - List micUserVoList = topRoomTabHomeVo.getMicUsers(); - topRoomTabHomeVo.setMicUsers(this.subList(0, 5, micUserVoList)); - }); - this.checkIsCrossPking(topRoomTabVoList, this::checkTopRoomTabIsCrossPking); - //装饰 - PlayRoomDecorateChain decorateChain = new PlayRoomDecorateChain<>( - new UsersRoomDecorator<>(new MicUsersRoomDecorator<>(new CrossPkIngRoomDecorator<>(), 0, 5), roomList, usersList) - ); - decorateChain.decorate(topRoomTabVoList); - } - return topRoomTabVoList.stream().filter(v -> u != null && u.getPartitionId() != null && u.getPartitionId().equals(v.getPartitionId())).collect(Collectors.toList()); - } - - - /** - * @param currentAppVersion：当前app版本 - * @param needVersion：需要的版本Constant.BigGooseConstant.big_goose_appver - * @return - */ - public Boolean versionCheck(String currentAppVersion, String needVersion) { - if (StringUtils.isEmpty(currentAppVersion)) { - logger.info("app首页请求没有携带版本信息..."); - return false; - } - if (AppVersionUtil.compareVersion(currentAppVersion, needVersion) < 0) { - return false; - } else { - return true; - } - } - /** * 获取首页房间标签 * @@ -797,118 +420,6 @@ public class HomeService extends BaseService { return this.getHomeRoomTab(); } - - /** - * 决策是否要添加banner - * - * @param bannerVoList - * @param list - * @return - */ - public List decisionAddBannerToList(List bannerVoList, List list) { - if (CollectionUtils.isEmpty(list)) { - if (CollectionUtils.isEmpty(bannerVoList)) return Collections.emptyList(); - List resultList = new ArrayList<>(); - PlayRoomVo playRoomVo = new PlayRoomVo(); - playRoomVo.setIsBanner(true); - playRoomVo.setBannerVoList(bannerVoList); - resultList.add(playRoomVo); - return resultList; - } - if (CollectionUtils.isEmpty(bannerVoList)) return list; - if (list.size() > 4) { - PlayRoomVo playRoomVo = new PlayRoomVo(); - playRoomVo.setIsBanner(true); - playRoomVo.setBannerVoList(bannerVoList); - list.add(4, playRoomVo); - //要求banner放在第四个位置 - return list; - } - - //不足四个设置在最后一个位置设置banner - - PlayRoomVo playRoomVo = new PlayRoomVo(); - playRoomVo.setIsBanner(true); - playRoomVo.setBannerVoList(bannerVoList); - list.add(playRoomVo); - return list; - - } - - /** - * 决策获取banner - * - * @param uid - * @param currentTabTxt:当前接口对应的tab文本 - * @param deviceInfo - * @return - */ - private List decisionTakeBannerVo(Long uid, String currentTabTxt, DeviceInfo deviceInfo, Boolean defaultPick) { - List bannerVoList = new ArrayList<>(); - if (!defaultPick) return bannerVoList; - else { - bannerVoList = firstPageBannerService.getFirstPageBanner(1, deviceInfo, uid); - if (CollectionUtils.isEmpty(bannerVoList)) { - logger.info("首页改版热门房间tab用户{}未获取到banner", uid); - } - return bannerVoList; - } - } - - private PlayRoomVo bulidMiniGame(Long roomUid, PlayRoomVo playRoomVo) { - MiniGameSwitchRecord miniGameSwitchRecord = miniGameSwitchRecordService.queryValidMiniGameSwitchRecord(roomUid); - if (miniGameSwitchRecord == null) { - return playRoomVo; - } - MiniGame miniGame = miniGameService.queryMiniGameByMgId(miniGameSwitchRecord.getMgId()); - playRoomVo.setMgName(miniGame.getName()); - return playRoomVo; - } - - /** - * 首页推荐、派对部分分类 房间按渠道内容过滤 - * - * @param uidList - * @param list - * @return - */ - public List filterTopRoomTabByChannel(List uidList, List list) { - return list.stream().filter(topRoomTabHomeVo -> uidList.contains(topRoomTabHomeVo.getRoomUid())).collect(Collectors.toList()); - } - - /** - * 首页改版4.0.0 推荐房间按渠道内容过滤 - * - * @param uidList - * @param list - * @return - */ - public List filterRoomTabHomeByChannel(List uidList, List list) { - return list.stream().filter(roomTabHome -> uidList.contains(roomTabHome.getRoomUid())).collect(Collectors.toList()); - } - - /** - * 组队开黑、热门房间列表按渠道过滤 - * - * @param uidList - * @param playRoomVos - * @return - */ - public List filterPlayRoomVoByChannel(List uidList, List playRoomVos) { - return playRoomVos.stream().filter(playRoomVo -> uidList.contains(playRoomVo.getUid())).collect(Collectors.toList()); - } - - /** - * 首页动态按渠道内容过滤 - * - * @param uidList - * @param list - * @return - */ - public List filterHomeDynamicByChannel(List uidList, List list) { - return list.stream().filter(dynamicVo -> uidList.contains(dynamicVo.getUid())).collect(Collectors.toList()); - } - /** * 获取热门 6 个房间中的随机一个roomUid * diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/impl/HomeIndexServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/impl/HomeIndexServiceImpl.java index 3d88fef55..6600693f4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/impl/HomeIndexServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/impl/HomeIndexServiceImpl.java @@ -3,54 +3,36 @@ package com.accompany.business.service.home.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.StrUtil; -import com.accompany.business.model.roomtab.RoomTabHome; import com.accompany.business.mybatismapper.RoomTabHomeMapper; import com.accompany.business.service.audiocard.AudioCardService; import com.accompany.business.service.follow.FansService; import com.accompany.business.service.home.HomeIndexService; -import com.accompany.business.service.home.decorator.CrossPkIngRoomDecorator; -import com.accompany.business.service.home.decorator.MicUsersRoomDecorator; -import com.accompany.business.service.home.decorator.PlayRoomDecorateChain; -import com.accompany.business.service.home.decorator.UsersRoomDecorator; -import com.accompany.business.service.home.filter.*; import com.accompany.business.service.label.LabelService; import com.accompany.business.service.level.LevelService; -import com.accompany.business.service.rank.RankService; -import com.accompany.business.service.room.RoomRankService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.room.SingleBroadcastPopularityService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.VipUtil; import com.accompany.business.vo.MicUserVo; -import com.accompany.business.vo.RankParentVo; -import com.accompany.business.vo.RankVo; import com.accompany.business.vo.RoomVo; import com.accompany.business.vo.home.HomeUserVo; import com.accompany.business.vo.home.NewFriendVo; import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.room.PermitRoomHourRankVo; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.GsonUtil; -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.base.UidContextHolder; -import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.audiocard.UserAudioCardVo; import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -68,18 +50,9 @@ public class HomeIndexServiceImpl implements HomeIndexService { @Autowired private JedisService jedisService; - @Autowired - private RoomService roomService; - @Autowired private UsersService usersService; - @Autowired - private RoomRankService roomRankService; - - @Autowired - private RankService rankService; - @Autowired private LabelService labelService; @@ -95,126 +68,6 @@ public class HomeIndexServiceImpl implements HomeIndexService { @Autowired private FansService fansService; - @Override - public List hotRoom() { - List result = new ArrayList<>(); - Map roomMicUpMap = jedisService.hgetAll(RedisKey.room_mic_up.getKey()); - List playRooms = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(roomMicUpMap)) { - playRooms.addAll(roomMicUpMap.values().stream().map(v -> GsonUtil.getDefGson().fromJson(v, PlayRoomVo.class)).collect(Collectors.toList())); - } - List roomUidList = playRooms.stream().map(PlayRoomVo::getUid).collect(Collectors.toList()); - List roomList = null; - List userList = null; - if (CollectionUtil.isNotEmpty(roomUidList)) { - roomList = roomService.getRoomListByUids(roomUidList); - userList = usersService.getUsersListByUids(roomUidList); - } - //过滤 - PlayRoomFilterChain filterChain = new PlayRoomFilterChain<>( - new BlackRoomFilter(), - new ValidRoomFilter(roomList, userList), - new SingleBroadcastRoomFilter(roomList) - ); - filterChain.doFilter(playRooms); - if (CollectionUtil.isNotEmpty(playRooms)) { - //装饰 - PlayRoomDecorateChain decorateChain = new PlayRoomDecorateChain<>( - new UsersRoomDecorator<>(new MicUsersRoomDecorator<>(new CrossPkIngRoomDecorator<>(), 0, 5), roomList, userList) - ); - decorateChain.decorate(playRooms); - Map playRoomMap = playRooms.stream().collect(Collectors.toMap(PlayRoomVo::getUid, Function.identity(), (v1, v2) -> v1)); - Date now = new Date(); - List roomTabHomes = roomTabHomeMapper.selectList(Wrappers.lambdaQuery() - .eq(RoomTabHome::getIsTop, Boolean.TRUE) - .orderByAsc(RoomTabHome::getSeq)); - List sortList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(roomTabHomes)) { - for (RoomTabHome roomTabHome : roomTabHomes) { - Date topStart = roomTabHome.getTopStart(); - Date topEnd = roomTabHome.getTopEnd(); - if (topStart != null && topStart.after(now)) { - continue; - } - if (topEnd != null && topEnd.before(now)) { - continue; - } - Long roomUid = roomTabHome.getRoomUid(); - if (playRoomMap.containsKey(roomUid)) { - sortList.add(playRoomMap.get(roomUid)); - } - } - } - result.addAll(sortList); - playRooms.removeIf(v1 -> sortList.stream().anyMatch(v2 -> v1.getUid().equals(v2.getUid()))); - //房间小时榜top1-3 - List top3 = roomRankService.listRankVo(0L, 3L, new Date()); - if (CollectionUtil.isNotEmpty(top3)) { - List top3Rooms = new ArrayList<>(); - for (int i = 0, len = top3.size(); i < len; i++) { - PermitRoomHourRankVo.PermitRoomHourRankListVo rank = top3.get(i); - Long uid = rank.getUid(); - Optional any = playRooms.stream().filter(v -> uid.equals(v.getUid())).findAny(); - if (any.isEmpty()) { - continue; - } - PlayRoomVo playRoom = any.get(); - if (i == 0) { - playRoom.setIsHourTop1(Constant.Yes1No0.YES); - } - top3Rooms.add(playRoom); - } - playRooms.removeIf(v1 -> top3Rooms.stream().anyMatch(v2 -> v1.getUid().equals(v2.getUid()))); - result.addAll(top3Rooms); - } - result.addAll(playRooms); - //设置周榜top1标识 - if (UidContextHolder.get() != null) { - RankParentVo parent = rankService.getTotalRank(UidContextHolder.get(), RedisKey.otaku_rank.name(), Constant.RankDatetype.week, 1, 1); - if (parent != null) { - List ranks = parent.getRankVoList(); - if (CollectionUtil.isNotEmpty(ranks)) { - RankVo rank = ranks.get(0); - for (PlayRoomVo playRoom : result) { - if (playRoom.getUid().equals(rank.getUid())) { - playRoom.setIsWeekTop1(Constant.Yes1No0.YES); - break; - } - } - } - } - } - } - //个人房推荐条件：在麦用户大于等于1且未锁房的所有非牌照房类型 - if (CollectionUtil.isNotEmpty(roomMicUpMap)) { - List personRooms = roomMicUpMap.values().stream().map(v -> GsonUtil.getDefGson().fromJson(v, PlayRoomVo.class)).filter(v -> !Arrays.asList(Constant.PermitType.PERMIT_ROOM, Constant.PermitType.SINGLE_BROADCAST).contains(v.getIsPermitRoom())).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(personRooms)) { - List personUidList = personRooms.stream().map(PlayRoomVo::getUid).collect(Collectors.toList()); - List personRoomList = roomService.getRoomListByUids(personUidList); - List personUserList = usersService.getUsersListByUids(personUidList); - filterChain = new PlayRoomFilterChain<>( - new ValidRoomFilter(personRoomList, personUserList) - ); - filterChain.doFilter(personRooms); - //装饰 - PlayRoomDecorateChain decorateChain = new PlayRoomDecorateChain<>( - new UsersRoomDecorator<>(new MicUsersRoomDecorator<>(new CrossPkIngRoomDecorator<>(), 0, 5), personRoomList, personUserList) - ); - decorateChain.decorate(personRooms); - } - result.addAll(personRooms.stream().sorted(Comparator.comparingInt(PlayRoomVo::getOnlineNum).reversed()).collect(Collectors.toList())); - } - Long uid = UidContextHolder.get(); - if (uid != null) { - Users users = usersService.getUsersByUid(uid); - if (users != null) { - Integer partitionId = users.getPartitionId(); - result = result.stream().filter(v -> partitionId == null || partitionId.equals(v.getPartitionId())).collect(Collectors.toList()); - } - } - return result.stream().filter(v -> StrUtil.isNotEmpty(v.getTitle())).collect(Collectors.toList()); - } - @Override public List newFriend(Byte gender) { Long uid = UidContextHolder.get(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/HomeV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/HomeV2Service.java index 980cfdaba..345639570 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/HomeV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/HomeV2Service.java @@ -5,40 +5,40 @@ import com.accompany.business.model.roomtab.RoomTabMap; import com.accompany.business.service.homeV2.filter.HomeRoomFilterEnum; import com.accompany.business.service.homeV2.filter.HomeRoomFilterService; import com.accompany.business.service.homeV2.sort.HomeRoomSortService; -import com.accompany.business.service.rank.IRank; -import com.accompany.business.service.rank.RankServiceFactory; -import com.accompany.business.service.rank.room.PermitRoomRankService; import com.accompany.business.service.room.RoomBoomBizService; -import com.accompany.business.service.room.RoomService; import com.accompany.business.service.roomtab.RoomTabMapService; import com.accompany.business.service.roomtab.RoomTabService; import com.accompany.business.service.user.UsersService; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.business.vo.roomtab.HomeRoomTabVo; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; -import com.accompany.common.enums.RedisZSetEnum; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.GsonUtil; -import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.PartitionEnum; -import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.region.RegionInfoService; import com.accompany.core.util.StringUtils; import org.apache.commons.collections.CollectionUtils; +import org.redisson.api.RList; +import org.redisson.api.RLock; +import org.redisson.api.RedissonClient; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.Instant; import java.time.ZonedDateTime; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Service -public class HomeV2Service { +public class HomeV2Service implements InitializingBean { @Autowired private UsersService usersService; @@ -55,29 +55,60 @@ public class HomeV2Service { @Autowired private RoomTabMapService roomTabMapService; @Autowired - private RoomService roomService; - @Autowired private RoomBoomBizService roomBoomBizService; @Autowired private RegionInfoService regionInfoService; + @Autowired + private RedissonClient redissonClient; + + private RList tabListCache; public List listTab() { - List tabList = roomTabService.lambdaQuery() - .eq(RoomTab::getStatus, Constant.Yes1No0.YES) - .orderByAsc(RoomTab::getSeq) - .list(); - if (CollectionUtils.isEmpty(tabList)){ - return Collections.emptyList(); + List cacheList = tabListCache.readAll(); + if (!CollectionUtils.isEmpty(cacheList)) { + return cacheList; } - return tabList.stream().map(roomTab -> { - HomeRoomTabVo homeRoomTabVo = new HomeRoomTabVo(); - BeanUtils.copyProperties(roomTab, homeRoomTabVo); - return homeRoomTabVo; - }).collect(Collectors.toList()); + boolean isLocked = false; + RLock lock = redissonClient.getLock(RedisKey.home_v2_tab_list_lock.getKey()); + try { + isLocked = lock.tryLock(3,3, TimeUnit.SECONDS); + + cacheList = tabListCache.readAll(); + + if (!isLocked || CollectionUtils.isNotEmpty(cacheList)) { + return cacheList; + } + + List tabList = roomTabService.lambdaQuery() + .eq(RoomTab::getStatus, Constant.Yes1No0.YES) + .orderByAsc(RoomTab::getSeq) + .list(); + if (CollectionUtils.isEmpty(tabList)){ + return Collections.emptyList(); + } + + List tabVoList = tabList.stream().map(roomTab -> { + HomeRoomTabVo homeRoomTabVo = new HomeRoomTabVo(); + BeanUtils.copyProperties(roomTab, homeRoomTabVo); + return homeRoomTabVo; + }).collect(Collectors.toList()); + + tabListCache.addAll(tabVoList); + tabListCache.expire(Instant.now().plusSeconds(10L)); + + return tabVoList; + + } catch (InterruptedException e) { + throw new RuntimeException(e); + } finally { + if (isLocked) { + lock.unlock(); + } + } } - public List pageRoom(Long uid, Integer pageNum, Integer pageSize, + public List pageRoom(Long uid, Integer pageNum, Integer pageSize, String filterStrategy, String sorterStrategy) { Users me = usersService.getNotNullUsersByUid(uid); @@ -98,14 +129,16 @@ public class HomeV2Service { return Collections.emptyList(); } - List roomUidList = sortService.sort(roomUidSet, uid, sorterStrategy); + List homeVoList = sortService.sort(roomUidSet, me.getPartitionId(), sorterStrategy); - List roomUidPage = page(roomUidList, startIndex, pageSize); + filterService.filterUserBlack(homeVoList, uid); + + List roomUidPage = page(homeVoList, startIndex, pageSize); return decorator(roomUidPage, me.getPartitionId()); } - public List pageRoomTab(Long uid, Long tabId, Integer pageNum, Integer pageSize) { + public List pageRoomTab(Long uid, Long tabId, Integer pageNum, Integer pageSize) { RoomTab roomTab = roomTabService.getById(tabId); if (null == roomTab){ return Collections.emptyList(); @@ -113,7 +146,11 @@ public class HomeV2Service { Users me = usersService.getNotNullUsersByUid(uid); - Set roomUidSet = getPartitionPoolSet(me.getPartitionId()); + return pageRoomTab(roomTab, uid, me.getPartitionId(), pageNum, pageSize); + } + + public List pageRoomTab(RoomTab roomTab, Long uid, Integer partitionId, Integer pageNum, Integer pageSize) { + Set roomUidSet = getPartitionPoolSet(partitionId); if (CollectionUtils.isEmpty(roomUidSet)){ return Collections.emptyList(); } @@ -129,15 +166,16 @@ public class HomeV2Service { return Collections.emptyList(); } - List roomUidList = sort(roomUidSet, roomTab, uid); + List homeRoomList = sortService.sort(roomUidSet, partitionId, roomTab); - List roomUidPage = page(roomUidList, startIndex, pageSize); + // 可能后台用 + if (null != uid){ + filterService.filterUserBlack(homeRoomList, uid); + } - return decorator(roomUidPage, me.getPartitionId()); - } + List roomUidPage = page(homeRoomList, startIndex, pageSize); - private List sort(Set roomUidSet, RoomTab roomTab, Long uid) { - return sortService.sort(roomUidSet, roomTab, uid); + return decorator(roomUidPage, partitionId); } private void filter(Set roomUidSet, Long uid, RoomTab roomTab) { @@ -170,22 +208,21 @@ public class HomeV2Service { return poolService.getPartitionMap(partitionId).readAllKeySet(); } - private List page(List roomUidList, Integer startIndex, Integer pageSize) { - int endIndex = Math.min(startIndex + pageSize, roomUidList.size()); - return roomUidList.subList(startIndex, endIndex); + private List page(List roomVoList, Integer startIndex, Integer pageSize) { + int endIndex = Math.min(startIndex + pageSize, roomVoList.size()); + return roomVoList.subList(startIndex, endIndex); } - public List decorator(List roomUidPage, Integer partitionId) { - Map roomMap = roomService.getRoomMap(roomUidPage); + public List decorator(List roomUidPage, Integer partitionId) { - String[] uidArray = roomUidPage.stream().map(Object::toString).toArray(String[]::new); + String[] uidArray = roomUidPage.stream().map(HomeRoomVo::getUid).map(Object::toString).toArray(String[]::new); List cacheList = jedisService.hmread(RedisKey.room_mic_up.getKey(), uidArray); if (CollectionUtils.isEmpty(cacheList)){ return Collections.emptyList(); } - List result = cacheList.stream().filter(str->StringUtils.isNotBlank(str) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str)) - .map(str->GsonUtil.getGson().fromJson(str, PlayRoomVo.class)).collect(Collectors.toList()); + Map result = cacheList.stream().filter(str->StringUtils.isNotBlank(str) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str)) + .map(str->GsonUtil.getGson().fromJson(str, PlayRoomVo.class)).collect(Collectors.toMap(PlayRoomVo::getUid, v->v)); Map usersMap = usersService.getUsersMapBatch(uidArray); @@ -193,50 +230,35 @@ public class HomeV2Service { Set pkRoomUidStrSet = jedisService.hgetAllKeysByKey(RedisKey.corss_room_round_pking.getKey()); - String lastHourKey = SpringContextHolder.getBean(PermitRoomRankService.class).getRankKey(partitionId); - Set> roomHourRankTop1 = jedisService.zrevrangeWithScore(lastHourKey, 0L, 0L); - Set roomHourTop1Set = Optional.ofNullable(roomHourRankTop1).orElse(new HashSet<>()) - .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong).collect(Collectors.toSet()); - - IRank roomWeekRank = RankServiceFactory.getServiceByType(RedisKey.otaku_rank.name(), Constant.RankDatetype.week.toString()); - Set> roomWeekRankTop1 = roomWeekRank.getRank(0L, 0L, partitionId); - Set roomWeekTop1Set = Optional.ofNullable(roomWeekRankTop1).orElse(new HashSet<>()) - .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong).collect(Collectors.toSet()); - PartitionEnum partitionInfo = PartitionEnum.getByPartitionId(partitionId); ZonedDateTime dateTimeByZoneId = DateTimeUtil.convertWithZoneId(new Date(), partitionInfo.getZoneId()); // 获取本轮boom玩法的当天日期 String cycleDate = DateTimeUtil.formatDate(dateTimeByZoneId); - for (PlayRoomVo roomVo: result){ - Users u = usersMap.get(roomVo.getUid()); + roomUidPage.parallelStream().forEach(vo -> { + Users u = usersMap.get(vo.getUid()); if (null != u){ - roomVo.setErbanNo(u.getErbanNo()); - roomVo.setAvatar(u.getAvatar()); + vo.setErbanNo(u.getErbanNo()); + vo.setAvatar(u.getAvatar()); if (null != u.getRegionId()){ - roomVo.setRegionFlag(regionFlagMap.get(u.getRegionId())); + vo.setRegionFlag(regionFlagMap.get(u.getRegionId())); } } - Room room = roomMap.get(roomVo.getUid()); - if (null != room){ - BeanUtils.copyProperties(room, roomVo); - //roomVo.setTitle(room.getTitle()); - //roomVo.setRoomDesc(room.getRoomDesc()); - //roomVo.setOnlineNum(room.getOnlineNum()); + PlayRoomVo playRoomVo = result.get(vo.getUid()); + if (null != playRoomVo){ + vo.setMicUserCount(playRoomVo.getMicUserCount()); + vo.setMicUsers(playRoomVo.getMicUsers()); + vo.setLastMicUpTimestamp(playRoomVo.getLastMicUpTimestamp()); } - roomVo.setIsHourTop1(roomHourTop1Set.contains(roomVo.getUid())? Constant.Yes1No0.YES: Constant.Yes1No0.NO); + vo.setCrossPking(!Constant.PermitType.SINGLE_BROADCAST.equals(vo.getIsPermitRoom()) && + !CollectionUtils.isEmpty(pkRoomUidStrSet) && pkRoomUidStrSet.contains(vo.getUid().toString())); - roomVo.setIsWeekTop1(roomWeekTop1Set.contains(roomVo.getUid())? Constant.Yes1No0.YES: Constant.Yes1No0.NO); - - roomVo.setCrossPking(!Constant.PermitType.SINGLE_BROADCAST.equals(roomVo.getIsPermitRoom()) && - !CollectionUtils.isEmpty(pkRoomUidStrSet) && pkRoomUidStrSet.contains(roomVo.getUid().toString())); - roomBoomBizService.filterRoomBoom(roomVo, cycleDate); - } - - return result; + roomBoomBizService.filterRoomBoom(vo, cycleDate); + }); + return roomUidPage; } public void clearPartitionPoolSet(Integer partitionId){ @@ -262,4 +284,8 @@ public class HomeV2Service { poolService.getPartitionMap(partitionId).fastRemove(emptyRoomList); } + @Override + public void afterPropertiesSet() throws Exception { + tabListCache = redissonClient.getList(RedisKey.home_v2_tab_list.getKey()); + } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/filter/HomeRoomFilterService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/filter/HomeRoomFilterService.java index aa2a09770..ea9e5df57 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/filter/HomeRoomFilterService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/filter/HomeRoomFilterService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.homeV2.filter; -import com.accompany.business.model.roomtab.RoomTab; import com.accompany.business.service.user.UserBlackRecordService; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.common.constant.Constant; import com.alibaba.excel.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +10,7 @@ import org.springframework.util.CollectionUtils; import java.util.Collection; import java.util.List; -import java.util.Set; +import java.util.stream.Collectors; @Service public class HomeRoomFilterService { @@ -19,8 +19,6 @@ public class HomeRoomFilterService { private UserBlackRecordService userBlackRecordService; public void filter(Collection roomUidSet, Long uid, String filterStrategy) { - baseFilter(roomUidSet, uid); - if (CollectionUtils.isEmpty(roomUidSet)){ return; } @@ -28,10 +26,18 @@ public class HomeRoomFilterService { roomTabFilter(roomUidSet, uid, filterStrategy); } - private void baseFilter(Collection roomUidSet, Long uid) { + public void filterUserBlack(Collection homeVoList, Long uid) { //黑名单 List blackRoomUidList = userBlackRecordService.getBlackIdList(uid, Constant.UserBlackType.room); - blackRoomUidList.forEach(roomUidSet::remove); + if (CollectionUtils.isEmpty(blackRoomUidList)){ + return; + } + + List excludeList = homeVoList.stream().filter(vo->blackRoomUidList.contains(vo.getUid())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(excludeList)){ + return; + } + homeVoList.removeAll(excludeList); } private void roomTabFilter(Collection roomUidSet, Long uid, String filterStrategy) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSortService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSortService.java index f65686708..40fe59c8e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSortService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSortService.java @@ -1,20 +1,20 @@ package com.accompany.business.service.homeV2.sort; import com.accompany.business.model.roomtab.RoomTab; -import com.accompany.business.model.roomtab.RoomTabHome; -import com.accompany.business.model.roomtab.RoomTabNewest; import com.accompany.business.model.roomtab.RoomTabMap; import com.accompany.business.service.roomtab.RoomTabHomeService; import com.accompany.business.service.roomtab.RoomTabMapService; import com.accompany.business.service.roomtab.RoomTabNewestService; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; +import com.accompany.business.vo.home.HomeRoomVo; import jodd.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @Service @@ -27,39 +27,35 @@ public class HomeRoomSortService { @Autowired private RoomTabNewestService roomTabNewestService; - public List sort(Collection roomUidSet, Long uid, String sortStrategy) { + public List sort(Collection roomUidSet, Integer partitionId, String sortStrategy) { if (StringUtil.isBlank(sortStrategy)){ - return new ArrayList<>(roomUidSet); + return decorateSortValue(roomUidSet, partitionId); } HomeRoomSorterEnum sorterEnum = HomeRoomSorterEnum.valueOf(sortStrategy); - return sorterEnum.getSorter().apply(roomUidSet, uid); + return sorterEnum.getSorter().apply(roomUidSet, partitionId); } - public List sort(Collection roomUidSet, RoomTab roomTab, Long uid) { + public List sort(Collection roomUidSet, Integer partitionId, RoomTab roomTab) { if (!roomTab.getIsHomeRecommend() && !roomTab.getIsHomeNewest()){ - return roomTabSort(roomUidSet, roomTab.getId()); + return roomTabSort(roomUidSet, partitionId, roomTab.getId()); } - List topList = baseSort(roomUidSet, roomTab); + /*List topList = roomTab.getIsHomeRecommend()? + sort(roomUidSet, partitionId, HomeRoomSorterEnum.Hot.name()): + sort(roomUidSet, partitionId, HomeRoomSorterEnum.Newest.name()); if (!CollectionUtils.isEmpty(topList)){ - topList.forEach(roomUidSet::remove); + topList.stream().map(HomeRoomVo::getUid).forEach(roomUidSet::remove); } - List sortList = sort(roomUidSet, uid, roomTab); + List sortList = sort(roomUidSet, partitionId, roomTab); topList.addAll(sortList); - return topList; + return topList;*/ + return roomTab.getIsHomeRecommend()? + sort(roomUidSet, partitionId, HomeRoomSorterEnum.Hot.name()): + sort(roomUidSet, partitionId, HomeRoomSorterEnum.Newest.name()); } - private List sort(Collection roomUidSet, Long uid, RoomTab roomTab) { - if (roomTab.getIsHomeRecommend()){ - return sort(roomUidSet, uid, HomeRoomSorterEnum.Hot.name()); - } else if (roomTab.getIsHomeNewest()) { - return sort(roomUidSet, uid, HomeRoomSorterEnum.Newest.name()); - } - throw new ServiceException(BusiStatus.SERVERERROR); - } - - private List roomTabSort(Collection roomUidSet, Long tabId) { + private List roomTabSort(Collection roomUidSet, Integer partitionId, Long tabId) { Date now = new Date(); - return roomTabMapService.lambdaQuery() + List roomTabSort = roomTabMapService.lambdaQuery() .in(RoomTabMap::getRoomUid, roomUidSet) .eq(RoomTabMap::getTabId, tabId) .orderByAsc(RoomTabMap::getIsTop, RoomTabMap::getSeq) @@ -75,9 +71,17 @@ public class HomeRoomSortService { }) .map(RoomTabMap::getRoomUid) .collect(Collectors.toList()); + if (CollectionUtils.isEmpty(roomTabSort)){ + return Collections.emptyList(); + } + return decorateSortValue(roomTabSort, partitionId); } - private List baseSort(Collection roomUidSet, RoomTab roomTab) { + private List decorateSortValue(Collection roomUidList, Integer partitionId) { + return HomeRoomSorterEnum.baseSort(roomUidList, partitionId); + } + + /*private List baseSort(Collection roomUidSet, RoomTab roomTab) { if (roomTab.getIsHomeRecommend()){ Date now = new Date(); return roomTabHomeService.lambdaQuery() @@ -116,6 +120,6 @@ public class HomeRoomSortService { .collect(Collectors.toList()); } throw new ServiceException(BusiStatus.SERVERERROR); - } + }*/ } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSorterEnum.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSorterEnum.java index 9d7295ae4..b6b86da97 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSorterEnum.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/homeV2/sort/HomeRoomSorterEnum.java @@ -1,26 +1,18 @@ package com.accompany.business.service.homeV2.sort; -import com.accompany.business.service.rank.IRank; -import com.accompany.business.service.rank.RankServiceFactory; import com.accompany.business.service.rank.room.PermitRoomRankService; import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.home.SimplePlayRoomVo; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.constant.Constant; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.common.enums.RedisZSetEnum; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.GsonUtil; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.model.Room; -import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; +import org.springframework.beans.BeanUtils; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.function.BiFunction; -import java.util.function.Function; import java.util.stream.Collectors; public enum HomeRoomSorterEnum { @@ -29,39 +21,13 @@ public enum HomeRoomSorterEnum { Newest(getNewestSort()), ; - private static BiFunction, Long, List> getHotSort() { - return (roomUidList, uid)->{ - - Users me = SpringContextHolder.getBean(UsersService.class).getNotNullUsersByUid(uid); - - String lastHourKey = SpringContextHolder.getBean(PermitRoomRankService.class).getRankKey(me.getPartitionId()); - Set> roomHourRankTop3 = SpringContextHolder.getBean(JedisService.class).zrevrangeWithScore(lastHourKey, 0L, 2L); - Set roomHourTop1Set = Optional.ofNullable(roomHourRankTop3).orElse(new HashSet<>()) - .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong).limit(1).collect(Collectors.toSet()); - - IRank roomWeekRank = RankServiceFactory.getServiceByType(RedisKey.otaku_rank.name(), Constant.RankDatetype.week); - Set> roomWeekRankTop1 = roomWeekRank.getRank(0L, 0L, me.getPartitionId()); - Set roomWeekTop1Set = Optional.ofNullable(roomWeekRankTop1).orElse(new HashSet<>()) - .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong).collect(Collectors.toSet()); - - List roomHourTop3List = Optional.ofNullable(roomHourRankTop3).orElse(new HashSet<>()) - .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong).skip(1).collect(Collectors.toList()); - - Map roomMap = SpringContextHolder.getBean(RoomService.class).getRoomMap(new ArrayList<>(roomUidList)); - - return roomUidList.stream().sorted(Comparator.comparing(roomUid->roomHourTop1Set.contains(roomUid)? 1: 0) - .thenComparing(roomUid->roomWeekTop1Set.contains(roomUid)? 1: 0) - .thenComparing(roomUid->roomHourTop3List.indexOf(roomUid)) - .thenComparing(roomUid->{ - Room r = roomMap.get(roomUid); - return null != r? r.getOnlineNum(): 0; - }) - .reversed()).collect(Collectors.toList()); - }; + private static BiFunction, Integer, List> getHotSort() { + return HomeRoomSorterEnum::baseSort; } - private static BiFunction, Long, List> getNewestSort() { - return (roomUidList, uid)->{ + private static BiFunction, Integer, List> getNewestSort() { + return HomeRoomSorterEnum::baseSort; + /*return (roomUidList, partitionId)->{ List cacheList = SpringContextHolder.getBean(JedisService.class).hmread(RedisKey.room_mic_up.getKey(), roomUidList.stream().map(Objects::toString).toArray(String[]::new)); return cacheList.stream() @@ -70,21 +36,73 @@ public enum HomeRoomSorterEnum { .sorted(Comparator.comparing(PlayRoomVo::getLastMicUpTimestamp, Comparator.nullsLast(Comparator.naturalOrder())).reversed()) .map(PlayRoomVo::getUid) .collect(Collectors.toList()); - }; + };*/ + } + + public static List baseSort(Collection roomUidList, Integer partitionId) { + String lastHourKey = SpringContextHolder.getBean(PermitRoomRankService.class).getRankKey(partitionId); + Set> roomHourRankTop3 = SpringContextHolder.getBean(JedisService.class).zrevrangeWithScore(lastHourKey, 0L, 2L); + List roomHourTopList = Optional.ofNullable(roomHourRankTop3).orElse(new HashSet<>()) + .stream().map(map->(String) map.get(RedisZSetEnum.member.name())).map(Long::parseLong) + .collect(Collectors.toList()); + + String[] roomUidArray = roomUidList.stream().map(Object::toString).toArray(String[]::new); + List scoreList = SpringContextHolder.getBean(JedisService.class).zmscore(lastHourKey, roomUidArray); + + Map scoreMap = new HashMap<>(); + for (int i = 0; i < roomUidList.size(); i++) { + Long roomUid = Long.valueOf(roomUidArray[i]); + scoreMap.put(roomUid, scoreList.get(i)); + } + + Map roomMap = SpringContextHolder.getBean(RoomService.class).getRoomMap(new ArrayList<>(roomUidList)); + + return roomUidList.stream().map(roomUid->{ + HomeRoomVo vo = new HomeRoomVo(); + vo.setUid(roomUid); + + Room room = roomMap.get(roomUid); + if (null != room) { + BeanUtils.copyProperties(room, vo); + } + + int index = roomHourTopList.indexOf(roomUid); + if (index == 0){ + vo.setIsHourTop1(1); + } + if (index != -1) { + vo.setHourTop(++index); + } + + if (vo.getOnlineNum() <= 0){ + return vo; + } + + Double score = scoreMap.get(roomUid); + if (null == score) { + score = 0d; + } + BigDecimal roomSerial = BigDecimal.valueOf(score).divide(BigDecimal.valueOf(7000L), 2, RoundingMode.HALF_UP); + BigDecimal roomOnlineValue = BigDecimal.valueOf(vo.getOnlineNum()).multiply(BigDecimal.valueOf(2.75d)); + vo.setHotValue(roomSerial.add(roomOnlineValue)); + + return vo; + }).sorted(Comparator.comparing(HomeRoomVo::getHotValue).reversed()) + .collect(Collectors.toList()); } - private BiFunction, Long, List> sorter; + private BiFunction, Integer, List> sorter; - public BiFunction, Long, List> getSorter() { + public BiFunction, Integer, List> getSorter() { return sorter; } - public void setSorter(BiFunction, Long, List> sorter) { + public void setSorter(BiFunction, Integer, List> sorter) { this.sorter = sorter; } - HomeRoomSorterEnum(BiFunction, Long, List> sorter) { + HomeRoomSorterEnum(BiFunction, Integer, List> sorter) { this.sorter = sorter; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPHandleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPHandleService.java index d2b84748d..b6113e087 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPHandleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPHandleService.java @@ -1,31 +1,13 @@ package com.accompany.business.service.iospay; -import com.accompany.business.dto.iospay.IOSRefundGiftStatDTO; -import com.accompany.business.model.UserPurse; import com.accompany.business.mybatismapper.iospay.IOSPayMapper; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Constant; -import com.accompany.common.push.MarkdownMessage; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.service.user.UsersBaseService; -import com.accompany.payment.model.ChargeRecord; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; /** *
类描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java index fb19b8dd8..af98b0dcc 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/iospay/IAPMessageService.java @@ -1,17 +1,17 @@ package com.accompany.business.service.iospay; import com.accompany.business.dto.iospay.IOSRefundGiftStatDTO; -import com.accompany.common.constant.Constant; -import com.accompany.common.push.MarkdownMessage; import com.accompany.business.model.UserPurse; import com.accompany.business.mybatismapper.iospay.IOSPayMapper; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; -import com.accompany.core.enumeration.PartitionEnum; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.common.config.SystemConfig; +import com.accompany.common.constant.Constant; +import com.accompany.common.push.MarkdownMessage; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.model.Users; +import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.payment.model.ChargeRecord; import com.alibaba.fastjson.JSON; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java index 69102a508..bacddeb7f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ip/IpRegionService.java @@ -10,7 +10,6 @@ import com.accompany.core.model.Account; import com.accompany.core.service.SysConfService; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.region.RegionNetworkService; -import com.accompany.core.service.region.RegionService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java index 75a2dd847..40263be90 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java @@ -6,7 +6,6 @@ import com.accompany.business.event.linearlypool.LinearlyPoolPrizeEvent; import com.accompany.business.message.PrizeEntity; import com.accompany.business.message.linearlypool.LinearlyPoolPrizeMessage; import com.accompany.business.param.neteasepush.Payload; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.prize.PrizeContext; import com.accompany.business.service.prize.PrizeStrategyFactory; import com.accompany.business.service.room.RoomQueryService; @@ -16,6 +15,7 @@ import com.accompany.business.vo.linearlypool.PrizePushMsg; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.constant.NetEaseCode; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java index 556675f04..2095a11be 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java @@ -9,8 +9,6 @@ import com.accompany.business.constant.linearlypool.LinearlyPoolConstants; import com.accompany.business.dto.linearlypool.LinearlyPoolConfigDTO; import com.accompany.business.dto.linearlypool.LinearlyPoolTotalStatisticsDTO; import com.accompany.business.message.PrizeEntity; -import com.accompany.business.service.mq.RocketMQService; -import com.accompany.common.push.MarkdownMessage; import com.accompany.business.message.linearlypool.LinearlyPoolPrizeMessage; import com.accompany.business.model.Prize; import com.accompany.business.model.PrizeExample; @@ -21,8 +19,7 @@ import com.accompany.business.model.user.UserActPropertyInfoV2; import com.accompany.business.mybatismapper.PrizeMapper; import com.accompany.business.service.box.PrizeService; import com.accompany.business.service.level.LevelService; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.service.message.MessageRobotPushService; +import com.accompany.business.service.mq.RocketMQService; import com.accompany.business.service.user.UserActPropertyInfoV2Service; import com.accompany.business.vo.PrizeWithRateVo; import com.accompany.business.vo.linearlypool.DrawResultVO; @@ -31,15 +28,18 @@ import com.accompany.common.annotation.Frozen; import com.accompany.common.config.SystemConfig; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.push.MarkdownMessage; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; +import com.accompany.common.utils.UUIDUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; +import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.util.DateUtil; import com.accompany.core.vo.UserLevelVo; import com.alibaba.fastjson.JSONObject; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24PoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24PoolService.java index eb51331ed..601a47819 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24PoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24PoolService.java @@ -6,7 +6,6 @@ import com.accompany.business.dto.lucky.Lucky24Result; import com.accompany.business.model.lucky.Lucky24Pool; import com.accompany.business.mybatismapper.lucky.Lucky24PoolMapper; import com.accompany.business.service.user.UsersService; -import com.accompany.business.service.vip.VipAuthItemBizService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java index 4d17535a1..c258ee2c2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/Lucky24RecordService.java @@ -1,11 +1,11 @@ package com.accompany.business.service.lucky; import com.accompany.business.model.Gift; -import com.accompany.sharding.model.Lucky24Record; +import com.accompany.business.mybatismapper.lucky.Lucky24StatMapper; import com.accompany.sharding.mapper.Lucky24RecordMapper; +import com.accompany.sharding.model.Lucky24Record; import com.accompany.sharding.vo.Lucky24PersonalStat; import com.accompany.sharding.vo.Lucky24PlatformStat; -import com.accompany.business.mybatismapper.lucky.Lucky24StatMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/SuperLuckyStockService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/SuperLuckyStockService.java index c659d71b9..be0b88764 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/SuperLuckyStockService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/SuperLuckyStockService.java @@ -1,10 +1,8 @@ package com.accompany.business.service.lucky; -import com.accompany.business.dto.lucky.SuperLuckyGiftConfig; import com.accompany.common.redis.RedisKey; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RAtomicDouble; -import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateRecordServiceImpl.java index 781850d0e..0a46aa5af 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateRecordServiceImpl.java @@ -10,7 +10,6 @@ import com.accompany.business.service.lucky.LuckyBagFortunateRecordService; import com.accompany.business.service.lucky.LuckyBagFortunateService; import com.accompany.business.vo.lucky.LuckyBagFortunateRecordVo; import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateServiceImpl.java index b4d2faf8e..ae6dbabe8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagFortunateServiceImpl.java @@ -8,7 +8,6 @@ import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.lucky.LuckyBagFortunateService; import com.accompany.business.vo.lucky.LuckyBagFortunateVo; import com.accompany.common.constant.Constant; -import com.accompany.core.model.Users; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/rank/LuckyBagWeekRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/rank/LuckyBagWeekRankService.java index 629b527a9..d0264774b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/rank/LuckyBagWeekRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/rank/LuckyBagWeekRankService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.lucky.rank; import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.common.dto.RankActConfigDto; import com.accompany.business.common.dto.RewardDto; import com.accompany.business.common.vo.RewardVo; import com.accompany.business.dto.lucky.LuckyBagWeekRankACtConfig; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagLinearPoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagLinearPoolService.java index 3d1dea399..146b7dad1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagLinearPoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagLinearPoolService.java @@ -7,7 +7,6 @@ import com.accompany.business.model.luckybag.LuckyBagRecord; import com.accompany.business.mybatismapper.luckybag.LuckyBagLinearPoolMapper; import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.user.UsersService; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.vo.luckybag.LuckyBagPoolVo; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.AppEnum; @@ -15,6 +14,7 @@ import com.accompany.common.constant.Constant; import com.accompany.common.push.MarkdownMessage; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.message.MessageRobotPushService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagPoolClockingService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagPoolClockingService.java index b039d619f..41d0ed773 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagPoolClockingService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagPoolClockingService.java @@ -3,7 +3,6 @@ package com.accompany.business.service.luckybag; import com.accompany.business.model.luckybag.LuckyBagPoolClocking; import com.accompany.business.mybatismapper.luckybag.LuckyBagPoolClockingMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagRecordService.java index 19d8b76b0..94832dccd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/luckybag/LuckyBagRecordService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.luckybag; import com.accompany.business.dto.lucky.LuckyBagRecordDto; -import com.accompany.business.model.Gift; import com.accompany.business.model.luckybag.LuckyBagRecord; import com.accompany.business.mybatismapper.luckybag.LuckyBagRecordMapper; import com.accompany.business.service.user.UsersService; @@ -13,12 +12,12 @@ import com.accompany.core.model.Users; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.redisson.api.RList; import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameCallbackService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameCallbackService.java index bb53a3bcd..37ac7228b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameCallbackService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameCallbackService.java @@ -11,10 +11,10 @@ import com.accompany.business.model.miniGame.MiniGameJoinAiRecord; import com.accompany.business.model.miniGame.MiniGameJoinUserRecord; import com.accompany.business.model.miniGame.MiniGameRound; import com.accompany.business.service.room.RoomService; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.base.SpringContextHolder; import com.accompany.common.config.MiniGameConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameJoinUserRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameJoinUserRecordService.java index 26d082132..400eacb38 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameJoinUserRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameJoinUserRecordService.java @@ -3,7 +3,6 @@ package com.accompany.business.service.miniGame; import com.accompany.business.dto.miniGame.GameEndDto; import com.accompany.business.dto.miniGame.GameStartDto; -import com.accompany.business.dto.miniGame.MiniGameInfoDto; import com.accompany.business.model.miniGame.MiniGameJoinUserRecord; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java index 4b514f3e1..fe2cde9b3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java @@ -5,39 +5,28 @@ import cn.hutool.core.util.StrUtil; import com.accompany.business.config.BaiShunMiniGameConfig; import com.accompany.business.dto.miniGame.MiniGameForBaiShunDto; import com.accompany.business.dto.miniGame.baishun.*; -import com.accompany.business.enums.message.ContentTypeEnum; -import com.accompany.business.enums.message.ResourceTypeEnum; import com.accompany.business.enums.resource.ResourceCodeEnum; import com.accompany.business.event.miniGame.MiniGameForBaiShunEvent; import com.accompany.business.model.UserPurse; import com.accompany.business.model.miniGame.MiniGameRecord; import com.accompany.business.model.miniGame.MiniGameRound; -import com.accompany.business.model.resource.Resource; import com.accompany.business.mybatismapper.miniGame.MiniGameRoundMapper; -import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.game.BaseGameMessageService; import com.accompany.business.service.miniGame.MiniGameForBaiShunService; import com.accompany.business.service.miniGame.MiniGameRecordService; import com.accompany.business.service.miniGame.MiniGameRoundService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.resource.ResourceService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.message.*; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.CurrencyEnum; -import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; -import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.MD5; import com.accompany.core.util.OkHttpUtils; import com.alibaba.fastjson.JSONArray; @@ -46,9 +35,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** * @author: liaozetao diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForSudServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForSudServiceImpl.java index ccc2a4a2f..822066a8f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForSudServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForSudServiceImpl.java @@ -3,7 +3,6 @@ package com.accompany.business.service.miniGame.impl; import cn.hutool.core.util.StrUtil; import com.accompany.business.constant.game.MiniGameForSudEventConstant; import com.accompany.business.dto.miniGame.sud.api.GetSudApi; -import com.accompany.business.dto.miniGame.sud.api.SudApi; import com.accompany.business.dto.miniGame.sud.event.RoomClearReqData; import com.accompany.business.dto.miniGame.sud.event.SudEvent; import com.accompany.business.service.miniGame.MiniGameForSudService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameInviteRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameInviteRecordServiceImpl.java index 060be8303..09111a729 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameInviteRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameInviteRecordServiceImpl.java @@ -5,7 +5,6 @@ import com.accompany.business.model.miniGame.MiniGameInviteRecord; import com.accompany.business.model.miniGame.MiniGameRoom; import com.accompany.business.mybatismapper.hall.HallSuperManageBizMapper; import com.accompany.business.mybatismapper.miniGame.MiniGameInviteRecordMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.miniGame.MiniGameInviteRecordService; import com.accompany.business.service.miniGame.MiniGameRoomService; import com.accompany.business.service.room.CrossRoomPkRoundService; @@ -14,6 +13,7 @@ import com.accompany.business.service.task.MiniGameDenyTaskService; import com.accompany.business.vo.hall.ClanSuperManageListVO; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameJoinUserRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameJoinUserRecordServiceImpl.java index e38caa868..08c538d41 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameJoinUserRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameJoinUserRecordServiceImpl.java @@ -2,7 +2,10 @@ package com.accompany.business.service.miniGame.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import com.accompany.business.dto.miniGame.*; +import com.accompany.business.dto.miniGame.GameEndDto; +import com.accompany.business.dto.miniGame.GameStartDto; +import com.accompany.business.dto.miniGame.PlayerDto; +import com.accompany.business.dto.miniGame.PlayerResultDto; import com.accompany.business.model.miniGame.MiniGameJoinAiRecord; import com.accompany.business.model.miniGame.MiniGameJoinUserRecord; import com.accompany.business.mybatismapper.miniGame.MiniGameJoinUserRecordMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameRoomServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameRoomServiceImpl.java index e70049ea3..febd3d3f7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameRoomServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameRoomServiceImpl.java @@ -6,7 +6,6 @@ import com.accompany.business.model.miniGame.MiniGameRoom; import com.accompany.business.mybatismapper.miniGame.MiniGameRoomMapper; import com.accompany.business.service.miniGame.MiniGameRoomService; import com.accompany.business.service.miniGame.MiniGameService; -import com.accompany.core.base.SpringContextHolder; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameSwitchRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameSwitchRecordServiceImpl.java index c2f870dc5..15c3dd083 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameSwitchRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameSwitchRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.accompany.business.service.miniGame.impl; import cn.hutool.core.util.ObjectUtil; -import com.accompany.business.model.miniGame.MiniGameRoom; import com.accompany.business.model.miniGame.MiniGameSwitchRecord; import com.accompany.business.mybatismapper.miniGame.MiniGameSwitchRecordMapper; import com.accompany.business.service.miniGame.MiniGameSwitchRecordService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java index d3f899ae1..85bf64718 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java @@ -67,7 +67,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.*; -import java.util.stream.Collectors; @Service @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java index f93d91dd3..cf36fc523 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java @@ -18,7 +18,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.netease.util.NetEaseConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.exception.ServiceException; @@ -27,7 +26,6 @@ import com.accompany.core.service.base.BaseService; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import lombok.val; -import javax.validation.constraints.NotNull; import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.BeanUtils; @@ -37,7 +35,11 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import javax.validation.constraints.NotNull; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * @Author: yangming diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java index c81289a22..db90e4980 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunAntiHandleService.java @@ -17,10 +17,10 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunCheckUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunCheckUtil.java index 7490e602f..32ca4c058 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunCheckUtil.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunCheckUtil.java @@ -13,13 +13,11 @@ package com.accompany.business.service.netease; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.dto.yidun.AntispamDto; -import com.accompany.business.dto.yidun.YiDunLivePersonResponseDto; import com.accompany.business.dto.yidun.YidunCheckRes; import com.accompany.business.dto.yidun.YidunLabelsDto; import com.accompany.business.sensitvienew.SensitiveConstant; import com.accompany.business.sensitvienew.SensitiveFilterUtil; import com.accompany.business.service.YidunCallbackService; -import com.accompany.common.config.YiDunCertConfig; import com.accompany.common.config.YidunCheckConfig; import com.accompany.common.config.YidunImageConfig; import com.accompany.common.constant.Constant; @@ -34,7 +32,6 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.util.HttpClient4Utils; import com.accompany.core.util.YidunGeneralUtils; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java index b2a1bbc1e..d65670d49 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/official/impl/OfficialConfigServiceImpl.java @@ -2,7 +2,6 @@ package com.accompany.business.service.official.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.accompany.business.constant.OsEnum; import com.accompany.business.model.official.OfficialBrowseRecord; import com.accompany.business.model.official.OfficialClickRecord; import com.accompany.business.model.official.OfficialConfig; @@ -25,10 +24,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java index 46dcab71e..c4e131c78 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/personalcenter/PersonalCenterService.java @@ -9,7 +9,6 @@ import com.accompany.business.service.hall.HallService; import com.accompany.business.service.hall.HallSuperManageService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.personalcenter.PersonalCenterVo; -import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.utils.AppVersionUtil; @@ -21,9 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberBizService.java index 208bacb73..9c5ad300a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberBizService.java @@ -1,23 +1,20 @@ package com.accompany.business.service.prettyno; import com.accompany.business.constant.PrettyNumberStatusEnum; -import com.accompany.business.constant.guild.GuildConstant; -import com.accompany.business.constant.guild.GuildUsdOperateTypeEnum; import com.accompany.business.model.pretty.PrettyNumberExamine; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.level.LevelService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.pretty.PrettyNumUserVo; import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.AppEnum; +import com.accompany.common.constant.Constant; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.PrettyNumber; +import com.accompany.core.model.Users; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.vo.PrettyNumberVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; import com.accompany.core.vo.UserLevelVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberExamineService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberExamineService.java index 7c4354f77..4f145f87d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberExamineService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberExamineService.java @@ -3,7 +3,6 @@ package com.accompany.business.service.prettyno; import com.accompany.business.enums.PrettyNumberExamineStatusEnum; import com.accompany.business.model.pretty.PrettyNumberExamine; import com.accompany.business.mybatismapper.PrettyNumberExamineMapper; -import com.accompany.common.constant.Constant; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberService.java index ed540323f..10036bf4a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prettyno/PrettyNumberService.java @@ -6,18 +6,20 @@ import com.accompany.business.constant.PrettyNumberStatusEnum; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.user.UsersService; -import com.accompany.core.vo.PrettyNumberVo; import com.accompany.common.config.SystemConfig; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.*; +import com.accompany.core.model.PrettyNumber; +import com.accompany.core.model.PrettyNumberRecord; +import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.PrettyNumberMapper; import com.accompany.core.mybatismapper.PrettyNumberRecordMapper; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.I18NMessageSourceUtil; +import com.accompany.core.vo.PrettyNumberVo; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/MedalPrizeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/MedalPrizeStrategy.java index 48c9baf63..21e1a83da 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/MedalPrizeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/MedalPrizeStrategy.java @@ -2,7 +2,6 @@ package com.accompany.business.service.prize.strategy; import com.accompany.business.constant.PrizeTypeEnum; import com.accompany.business.message.PrizeEntity; -import com.accompany.business.service.car.CarPayService; import com.accompany.business.service.medal.UserMedalService; import com.accompany.business.service.prize.PrizeContext; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/VipPrizeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/VipPrizeStrategy.java index ec4bb0396..1b796e2af 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/VipPrizeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/strategy/VipPrizeStrategy.java @@ -2,7 +2,6 @@ package com.accompany.business.service.prize.strategy; import com.accompany.business.constant.PrizeTypeEnum; import com.accompany.business.message.PrizeEntity; -import com.accompany.business.service.medal.UserMedalService; import com.accompany.business.service.prize.PrizeContext; import com.accompany.business.service.vip.VipSendService; import com.accompany.common.constant.Constant; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarRecordService.java index c3f0bce6e..b4962042c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarRecordService.java @@ -13,7 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarService.java index d9603c27c..17e727eff 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarService.java @@ -9,7 +9,6 @@ import com.accompany.business.model.promiseStar.PromiseStarRoundWhite; import com.accompany.business.model.promiseStar.PromiseStarUserRecord; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.gift.GiftService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.business.service.user.UserBackpackService; import com.accompany.business.vo.SimpleGiftVo; import com.accompany.business.vo.message.BaseSpan; @@ -19,15 +18,15 @@ import com.accompany.business.vo.promisestar.PromiseStarRoundUserRecordVo; import com.accompany.business.vo.promisestar.PromiseStarRoundVo; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; -import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.RandomUtil; import com.accompany.core.base.SpringContextHolder; +import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSON; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarStickService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarStickService.java index e4f93876a..fa8a4ec09 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarStickService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarStickService.java @@ -8,7 +8,6 @@ import com.accompany.business.service.user.UserActPropertyInfoV2Service; import com.accompany.common.status.BusiStatus; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarUserRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarUserRecordService.java index 59b54d3f2..6e2a150ee 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarUserRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/promiseStar/PromiseStarUserRecordService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.promiseStar; import com.accompany.business.model.promiseStar.PromiseStarConfig; -import com.accompany.business.model.promiseStar.PromiseStarRound; import com.accompany.business.model.promiseStar.PromiseStarUserRecord; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/FamilyDiamondSettlementPurseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/FamilyDiamondSettlementPurseService.java index 3fcd70ea0..0d27cf5ef 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/FamilyDiamondSettlementPurseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/FamilyDiamondSettlementPurseService.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.concurrent.TimeUnit; @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java index 610870996..483782c94 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserPurseService.java @@ -10,9 +10,6 @@ import com.accompany.business.service.clan.ClanService; import com.accompany.business.service.gift.GiftSendConsumeGoldService; import com.accompany.business.service.user.UsersService; import com.accompany.business.service.withdraw.WithdrawUserLimitService; -import com.accompany.core.model.PartitionInfo; -import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.core.util.DoubleUtil; import com.accompany.business.vo.UserPurseVo; import com.accompany.business.vo.UserPurseWithRoomTypeVo; import com.accompany.common.annotation.Frozen; @@ -23,7 +20,10 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.enumeration.ExchangeTypeEnum; import com.accompany.core.exception.ServiceException; +import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; +import com.accompany.core.service.partition.PartitionInfoService; +import com.accompany.core.util.DoubleUtil; import com.accompany.core.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/PermitRoomTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/PermitRoomTaskService.java index 500117745..83198d94b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/PermitRoomTaskService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/PermitRoomTaskService.java @@ -1,10 +1,10 @@ package com.accompany.business.service.rank; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomRankService; import com.accompany.business.service.room.RoomService; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/RankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/RankService.java index 25c9d9203..ade80aee5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/RankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/RankService.java @@ -6,7 +6,10 @@ import com.accompany.business.service.level.LevelService; import com.accompany.business.service.rank.room.PermitRoomRankService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.*; +import com.accompany.business.vo.RankMineVo; +import com.accompany.business.vo.RankParentVo; +import com.accompany.business.vo.RankVo; +import com.accompany.business.vo.RoomVo; import com.accompany.common.constant.Constant; import com.accompany.common.enums.RedisZSetEnum; import com.accompany.common.redis.RedisKey; @@ -17,7 +20,6 @@ import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.vo.UserLevelVo; -import com.accompany.core.vo.UserVo; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/miniGame/AbstractMiniGameRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/miniGame/AbstractMiniGameRankService.java index 833620eb6..ffa6095fa 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/miniGame/AbstractMiniGameRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/miniGame/AbstractMiniGameRankService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.rank.miniGame; import com.accompany.business.service.rank.AbstractRankService; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/recevice/AbstractReceiveRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/recevice/AbstractReceiveRankService.java index 864131375..cffd75a46 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/recevice/AbstractReceiveRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/recevice/AbstractReceiveRankService.java @@ -5,7 +5,6 @@ import com.accompany.business.mybatismapper.RankMapperMgr; import com.accompany.business.param.RankParam; import com.accompany.business.service.rank.AbstractRankService; import com.accompany.business.vo.RankVo; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/room/AbstractRoomRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/room/AbstractRoomRankService.java index 941465403..032513186 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/room/AbstractRoomRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/room/AbstractRoomRankService.java @@ -5,7 +5,6 @@ import com.accompany.business.mybatismapper.RankMapperMgr; import com.accompany.business.param.RankParam; import com.accompany.business.service.rank.AbstractRankService; import com.accompany.business.vo.RankVo; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/send/AbstractSendRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/send/AbstractSendRankService.java index dc6361819..768916143 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/send/AbstractSendRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/send/AbstractSendRankService.java @@ -5,7 +5,6 @@ import com.accompany.business.mybatismapper.RankMapperMgr; import com.accompany.business.param.RankParam; import com.accompany.business.service.rank.AbstractRankService; import com.accompany.business.vo.RankVo; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java index d25e1e1d3..7f8a2c79a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; - @Service public class RedEnvelopeBackService extends ServiceImpl { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeGiftItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeGiftItemService.java index 7411d69b4..ebd349b2c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeGiftItemService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeGiftItemService.java @@ -1,10 +1,10 @@ package com.accompany.business.service.redenvelope; import cn.hutool.core.collection.CollectionUtil; +import com.accompany.business.dto.redenvelope.RedEnvelopeGiftItemDTO; import com.accompany.business.model.redenvelope.RedEnvelopeGiftItem; import com.accompany.business.mybatismapper.redenvelope.RedEnvelopeGiftItemMapper; import com.accompany.business.service.gift.GiftService; -import com.accompany.business.dto.redenvelope.RedEnvelopeGiftItemDTO; import com.accompany.business.vo.SimpleUserVo; import com.accompany.business.vo.redenvelope.RedEnvelopeGiftItemVo; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeRainService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeRainService.java index 2100ebed1..3d4c18104 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeRainService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeRainService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.redenvelope; import com.accompany.business.constant.redenvelope.OuterRedEnvelopeTypeEnum; import com.accompany.business.model.redenvelope.RedEnvelopeRain; -import com.accompany.business.vo.redenvelope.OpenRedEnvelopeRequest; import com.accompany.business.vo.redenvelope.SendRedEnvelopeRequest; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RedEnvelopeRainServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RedEnvelopeRainServiceImpl.java index 8c0e1cef9..3c4d1153f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RedEnvelopeRainServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RedEnvelopeRainServiceImpl.java @@ -2,25 +2,20 @@ package com.accompany.business.service.redenvelope.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.accompany.business.activity.model.ActActivity; import com.accompany.business.constant.redenvelope.OuterRedEnvelopeTypeEnum; import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; -import com.accompany.business.model.redenvelope.RedEnvelope; import com.accompany.business.model.redenvelope.RedEnvelopeRain; import com.accompany.business.model.redenvelope.RedEnvelopeRainRecord; import com.accompany.business.mybatismapper.redenvelope.RedEnvelopeRainMapper; import com.accompany.business.service.redenvelope.RedEnvelopeRainRecordService; import com.accompany.business.service.redenvelope.RedEnvelopeRainService; import com.accompany.business.service.redenvelope.RedEnvelopeService; -import com.accompany.business.service.redenvelope.strategy.RedEnvelopeContext; -import com.accompany.business.vo.redenvelope.OpenRedEnvelopeRequest; import com.accompany.business.vo.redenvelope.SendRedEnvelopeRequest; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.core.model.Room; import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.core.service.common.JedisService; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RoomRedEnvelopeServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RoomRedEnvelopeServiceImpl.java index afeb7a934..3d2d2e141 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RoomRedEnvelopeServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/impl/RoomRedEnvelopeServiceImpl.java @@ -2,11 +2,11 @@ package com.accompany.business.service.redenvelope.impl; import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.constant.redenvelope.RedEnvelopeTypeConstant; +import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; import com.accompany.business.model.redenvelope.RoomRedEnvelope; import com.accompany.business.mybatismapper.redenvelope.RoomRedEnvelopeMapper; import com.accompany.business.service.redenvelope.RedEnvelopeService; import com.accompany.business.service.redenvelope.RoomRedEnvelopeService; -import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; import com.accompany.core.service.user.UsersBaseService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/InRoomRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/InRoomRedEnvelopeStrategy.java index 8d64b3ec4..bbe7fe264 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/InRoomRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/InRoomRedEnvelopeStrategy.java @@ -13,17 +13,17 @@ import com.accompany.business.model.redenvelope.RedEnvelope; import com.accompany.business.service.follow.FansService; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; -import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; +import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.util.I18NMessageSourceUtil; import org.slf4j.LoggerFactory; -import java.util.*; +import java.util.List; /** * 房间红包策略基类 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/RedEnvelopeFactory.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/RedEnvelopeFactory.java index 5d74d16a1..d86e64322 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/RedEnvelopeFactory.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/RedEnvelopeFactory.java @@ -1,7 +1,5 @@ package com.accompany.business.service.redenvelope.strategy; -import com.accompany.business.enums.redenvelope.RedEnvelopeKindEnum; - public class RedEnvelopeFactory { public static IRedEnvelopeStrategy getInstance(int kind) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java index 7e4e56a8c..b2a275ef8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java @@ -1,14 +1,17 @@ package com.accompany.business.service.redenvelope.strategy.sendandopen; import cn.hutool.core.util.StrUtil; -import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; -import com.accompany.business.model.redenvelope.RedEnvelope; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.exception.ServiceException; import com.accompany.business.constant.redenvelope.OuterRedEnvelopeTypeEnum; import com.accompany.business.constant.redenvelope.RedEnvelopPositionEnum; import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; import com.accompany.business.constant.redenvelope.RedEnvelopTypeEnum; +import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; +import com.accompany.business.dto.redenvelope.RedEnvelopeDTO; +import com.accompany.business.dto.redenvelope.RedEnvelopeNotifyDTO; +import com.accompany.business.dto.redenvelope.RoomShowOpenRedEnvelopeDTO; +import com.accompany.business.enums.redenvelope.RedEnvelopeKindEnum; +import com.accompany.business.event.redenvelope.RedEnvelopeEvent; +import com.accompany.business.model.redenvelope.RedEnvelope; import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.follow.FansService; @@ -16,27 +19,21 @@ import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.redenvelope.RedEnvelopeBackService; import com.accompany.business.service.redenvelope.RedEnvelopeService; -import com.accompany.business.dto.redenvelope.RedEnvelopeDTO; -import com.accompany.business.dto.redenvelope.RedEnvelopeNotifyDTO; -import com.accompany.business.dto.redenvelope.RoomShowOpenRedEnvelopeDTO; -import com.accompany.business.enums.redenvelope.RedEnvelopeKindEnum; -import com.accompany.business.event.redenvelope.RedEnvelopeEvent; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; -import com.accompany.core.base.SpringContextHolder; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Constant; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; +import com.accompany.core.enumeration.I18nAlertEnum; +import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.core.util.I18NMessageSourceUtil; -import org.apache.commons.lang3.time.DateUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import java.util.Date; -import java.util.Map; /** * 红包策略 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategyContext.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategyContext.java index 50077b8da..c6ab1701b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategyContext.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategyContext.java @@ -1,6 +1,5 @@ package com.accompany.business.service.redenvelope.strategy.sendandopen; -import com.accompany.business.constant.redenvelope.RedEnvelopPositionEnum; import com.accompany.business.constant.redenvelope.RedEnvelopStateEnum; import com.accompany.business.constant.redenvelope.RedEnvelopTypeEnum; import com.accompany.business.model.redenvelope.RedEnvelope; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java index a5bdc5355..298278e31 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java @@ -1,19 +1,19 @@ package com.accompany.business.service.redenvelope.strategy.sendandopen.impl; -import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; import com.accompany.business.constant.redenvelope.RedEnvelopPositionEnum; import com.accompany.business.constant.redenvelope.RedEnvelopTypeEnum; +import com.accompany.business.dto.redenvelope.RedEnvelopeConfig; +import com.accompany.business.dto.redenvelope.RedEnvelopeDTO; import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.util.redenvelope.OpenRedEnvelopeUtil; import com.accompany.business.service.redenvelope.RedEnvelopeService; -import com.accompany.business.dto.redenvelope.RedEnvelopeDTO; import com.accompany.business.service.redenvelope.strategy.sendandopen.RedEnvelopeStrategy; import com.accompany.business.service.redenvelope.strategy.sendandopen.SendRedEnvelopeDTO; import com.accompany.business.service.room.RoomService; +import com.accompany.business.util.redenvelope.OpenRedEnvelopeUtil; import com.accompany.common.constant.Constant; +import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; import com.accompany.core.util.DoubleUtil; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.List; @Component @Qualifier("inRoomGoldRedEnvelopeStrategy") diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/ServerGiftRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/ServerGiftRedEnvelopeStrategy.java index c4a6b6f1a..2ae25562a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/ServerGiftRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/ServerGiftRedEnvelopeStrategy.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + import java.util.Date; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationInfoServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationInfoServiceImpl.java index fd648a0a0..0e865e337 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationInfoServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationInfoServiceImpl.java @@ -3,11 +3,9 @@ package com.accompany.business.service.relation; import com.accompany.business.constant.relation.RelationConstant; import com.accompany.business.model.relation.RelationInfo; import com.accompany.business.mybatismapper.relation.RelationInfoMapper; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationUserService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationUserService.java index 6323c4305..a01200992 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationUserService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/relation/RelationUserService.java @@ -4,7 +4,6 @@ import com.accompany.business.message.GiftMessage; import com.accompany.business.model.relation.RelationUser; import com.accompany.business.vo.relation.RelationUserVO; import com.accompany.common.result.BusiResult; -import com.accompany.core.vo.BaseResponseVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceEffectService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceEffectService.java index 208eafc99..01ca49135 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceEffectService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceEffectService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.resource; -import java.util.List; import java.util.Set; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceService.java index 7d3dfd60e..734368755 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/ResourceService.java @@ -1,7 +1,6 @@ package com.accompany.business.service.resource; import cn.hutool.core.collection.CollectionUtil; -import com.accompany.business.model.firstpage.FirstPageBanner; import com.accompany.business.model.resource.Resource; import com.accompany.business.vo.firstpage.FirstPageBannerVo; import com.accompany.core.vo.SplashVo; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/impl/ResourceEffectServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/impl/ResourceEffectServiceImpl.java index 05c1a5315..bdade63ea 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/impl/ResourceEffectServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/resource/impl/ResourceEffectServiceImpl.java @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/AbstractRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/AbstractRoomService.java index 94eebc38a..423c37490 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/AbstractRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/AbstractRoomService.java @@ -5,19 +5,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.dto.QueueListResponseDTO; import com.accompany.business.dto.QueueValueDTO; -import com.accompany.business.model.redis.RoomMic; -import com.accompany.business.model.redis.RoomMicUser; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.rank.room.SendRoomDayRankService; -import com.accompany.business.service.rank.room.SendRoomTotalRankService; import com.accompany.business.service.redenvelope.RedEnvelopeServerNotifySwitchService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomVo; import com.accompany.common.constant.Constant; import com.accompany.common.enums.RedisZSetEnum; import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.GsonUtil; import com.accompany.core.model.Room; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.common.JedisService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/FamilyMemberRoomMicRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/FamilyMemberRoomMicRecordService.java index 92d0a2f1b..7075adfac 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/FamilyMemberRoomMicRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/FamilyMemberRoomMicRecordService.java @@ -2,13 +2,13 @@ package com.accompany.business.service.room; import com.accompany.business.constant.family.FamilyConstant; import com.accompany.business.model.family.FamilyMember; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.sharding.model.FamilyMemberRoomMicRecord; import com.accompany.business.param.MicQueueParam; import com.accompany.business.service.family.FamilyMemberService; import com.accompany.common.redis.RedisKey; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Room; import com.accompany.sharding.mapper.FamilyMemberRoomMicRecordMapper; +import com.accompany.sharding.model.FamilyMemberRoomMicRecord; import com.accompany.sharding.vo.FamilyMemberMicRemainTimeVo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.SneakyThrows; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java index d44f1331e..f55ab351e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java @@ -1,11 +1,11 @@ package com.accompany.business.service.room; import com.accompany.business.model.redis.MicroSeqModel; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.business.vo.MicroSeqListVo; import com.accompany.business.vo.SeqVo; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java index 9ad14ae7d..35b11c72c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java @@ -1,11 +1,11 @@ package com.accompany.business.service.room; import com.accompany.business.model.redis.MicroSeqModelV2; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.MicroSeqV2Vo; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/PrivateChatItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/PrivateChatItemService.java index 476f9a735..0af55fb50 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/PrivateChatItemService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/PrivateChatItemService.java @@ -11,11 +11,8 @@ package com.accompany.business.service.room; import com.accompany.business.model.room.PrivateChatItem; -import com.accompany.business.model.room.RoomPlayType; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Date; - /** *
接口描述: *
功能详细描述: diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java index e6ebbcfb4..aa05c3a51 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java @@ -36,7 +36,10 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.time.Duration; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomAwardRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomAwardRecordService.java index c0e465916..8b92c5d5d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomAwardRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomAwardRecordService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.room; -import com.baomidou.mybatisplus.extension.service.IService; import com.accompany.business.model.room.RoomBoomAwardRecord; +import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java index 6ea94e92d..f8ed3118a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java @@ -11,7 +11,7 @@ import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.RoomBoomUtil; -import com.accompany.business.vo.home.PlayRoomVo; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.business.vo.room.*; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; @@ -177,19 +177,19 @@ public class RoomBoomBizService { } - public void filterRoomBoom(PlayRoomVo playRoomVo, String cycleDate) { + public void filterRoomBoom(HomeRoomVo homeRoomVo, String cycleDate) { RMap roomHotMap = this.getRoomHotMap(cycleDate); - playRoomVo.setRoomBoom(false); - RoomBoomLevelInfoVo roomBoomLevelInfoVo = roomHotMap.get(playRoomVo.getUid()); + homeRoomVo.setRoomBoom(false); + RoomBoomLevelInfoVo roomBoomLevelInfoVo = roomHotMap.get(homeRoomVo.getUid()); if (roomBoomLevelInfoVo == null) { return; } if (roomBoomLevelInfoVo.getSpeed() >= 0.9) { - playRoomVo.setRoomBoom(true); - playRoomVo.setRoomBoomPic(roomBoomLevelInfoVo.getPic()); - playRoomVo.setRoomBoomVapUrl(roomBoomLevelInfoVo.getVapUrl()); + homeRoomVo.setRoomBoom(true); + homeRoomVo.setRoomBoomPic(roomBoomLevelInfoVo.getPic()); + homeRoomVo.setRoomBoomVapUrl(roomBoomLevelInfoVo.getVapUrl()); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomLevelAwardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomLevelAwardService.java index 543b29c21..4421517b6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomLevelAwardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomLevelAwardService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.room; -import com.accompany.business.dto.room.RoomBoomLevelAwardDto; import com.accompany.business.model.room.RoomBoomLevelAward; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomCleanService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomCleanService.java index 1acde0554..86999bb63 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomCleanService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomCleanService.java @@ -12,7 +12,9 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * 清除无效的房间, 无效房间的定义： diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForPartyService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForPartyService.java index 41096273c..801ba23b5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForPartyService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForPartyService.java @@ -6,11 +6,8 @@ import com.accompany.business.constant.RoomTypeEnum; import com.accompany.business.service.AppVersionService; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.netease.neteaseacc.result.RoomMemberRet; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.AppVersionUtil; -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Account; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForRevelryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForRevelryService.java index 6bf2e570c..310724b23 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForRevelryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForRevelryService.java @@ -5,11 +5,8 @@ import cn.hutool.core.util.StrUtil; import com.accompany.business.constant.RoomTypeEnum; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.netease.neteaseacc.result.RoomMemberRet; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.AppVersionUtil; -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Account; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForSingleBroadcastService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForSingleBroadcastService.java index 0ba539154..f40dc4f67 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForSingleBroadcastService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForSingleBroadcastService.java @@ -8,7 +8,6 @@ import com.accompany.business.model.clan.ClanAccountAssociate; import com.accompany.business.model.room.SingleBroadcastSort; import com.accompany.business.service.clan.ClanAccountAssociateService; import com.accompany.business.service.rank.room.SingleRoomSendDayRankService; -import com.accompany.business.service.rank.room.SingleRoomSendTotalRankService; import com.accompany.business.vo.RoomVo; import com.accompany.common.constant.Constant; import com.accompany.common.enums.RedisZSetEnum; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomFreeGiftService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomFreeGiftService.java index c80822fae..b6983c3ed 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomFreeGiftService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomFreeGiftService.java @@ -5,12 +5,12 @@ import com.accompany.business.event.room.UserOutRoomEvent; import com.accompany.business.message.room.UserOutRoomMessage; import com.accompany.business.model.Gift; import com.accompany.business.param.UserBackpackParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.gift.GiftService; import com.accompany.business.service.user.UserBackpackService; import com.accompany.business.vo.room.RoomFreeGiftUserVo; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; @@ -21,7 +21,10 @@ import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.*; +import org.redisson.api.RLock; +import org.redisson.api.RMap; +import org.redisson.api.RSet; +import org.redisson.api.RedissonClient; import org.redisson.client.codec.LongCodec; import org.redisson.client.codec.StringCodec; import org.springframework.beans.factory.InitializingBean; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomGiftValueService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomGiftValueService.java index 4afe3be49..a920e9298 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomGiftValueService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomGiftValueService.java @@ -10,13 +10,13 @@ import com.accompany.business.model.Headwear; import com.accompany.business.model.room.BlindDateRound; import com.accompany.business.model.room.BlindDateRoundHistory; import com.accompany.business.mybatismapper.HeadwearMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.headwear.HeadwearService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomGiftValueVo; import com.accompany.business.vo.RoomNotifyVo; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; @@ -24,7 +24,6 @@ import com.accompany.common.utils.UUIDUtil; import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Room; import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java index 95bb6effb..4469dace3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java @@ -27,7 +27,10 @@ import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; @Slf4j diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java index 823bc4098..d730017b9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java @@ -6,7 +6,6 @@ import com.accompany.business.model.room.RoomPK; import com.accompany.business.mybatismapper.room.RoomPkMapper; import com.accompany.business.param.QueueMicroParam; import com.accompany.business.param.RoomPKTeam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomNotifyVo; import com.accompany.business.vo.UserBasicVo; @@ -15,6 +14,7 @@ import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java index b879a4668..7d2e5fe98 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.room; import com.accompany.business.model.redis.RoomMic; import com.accompany.business.param.QueueMicroParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomNotifyVo; import com.accompany.business.vo.room.MircoQueueVo; @@ -11,6 +10,7 @@ import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRankService.java index d318b47d2..b20bfcd8f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRankService.java @@ -8,10 +8,8 @@ import com.accompany.business.vo.room.PermitRoomHourRankVo; import com.accompany.business.vo.room.RoomRankShowVO; import com.accompany.business.vo.room.RoomRankingVo; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Room; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java index 689fdbfc7..60c4e4bf4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java @@ -1,11 +1,9 @@ package com.accompany.business.service.room; -import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.business.service.api.QinniuService; import com.accompany.business.service.clan.ClanService; import com.accompany.business.vo.RoomVo; -import com.accompany.sharding.vo.RoomSerialVo; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.RandomUtil; @@ -13,6 +11,8 @@ import com.accompany.common.utils.WeekUtil; import com.accompany.core.model.Room; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; +import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; +import com.accompany.sharding.vo.RoomSerialVo; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRewardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRewardService.java index 268dc86b5..50afcb8c4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRewardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRewardService.java @@ -2,10 +2,10 @@ package com.accompany.business.service.room; import com.accompany.business.model.RoomReward; import com.accompany.business.mybatismapper.RoomRewardMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.follow.FansService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RoomRewardVo; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java index 041b42d0f..5e816f93e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java @@ -48,14 +48,12 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.search.sort.*; - -import javax.validation.constraints.NotNull; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.*; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java index ee2c63c58..afba2943d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java @@ -21,7 +21,6 @@ import com.accompany.business.model.netease.MembersByPage; import com.accompany.business.model.room.RobotUsing; import com.accompany.business.model.room.SingleBroadcastSort; import com.accompany.business.mybatismapper.FansMapperExpand; -import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.business.mybatismapper.RoomInviteRecordMapper; import com.accompany.business.mybatismapper.miniGame.MiniGameRoundMapper; import com.accompany.business.param.LeftChatRoomParam; @@ -46,7 +45,6 @@ import com.accompany.business.util.TLSSigAPIv2; import com.accompany.business.vo.*; import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.business.vo.home.SimplePlayRoomVo; -import com.accompany.sharding.vo.RoomSerialVo; import com.accompany.common.config.NetEaseConfig; import com.accompany.common.config.SystemConfig; import com.accompany.common.config.TencentTRCTConfig; @@ -77,7 +75,9 @@ import com.accompany.core.util.BeanUtils; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.PartitionUtil; import com.accompany.core.vo.UserVo; +import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.sharding.model.GiftSendRecord; +import com.accompany.sharding.vo.RoomSerialVo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -87,8 +87,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Lazy; -import org.springframework.scheduling.annotation.Async; import org.springframework.http.HttpStatus; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -923,7 +923,7 @@ public class RoomService extends BaseService { } - public Map getRoomMap(List roomUids) { + public Map getRoomMap(Collection roomUids) { Map roomMap = Maps.newHashMap(); String[] uids = roomUids.stream().distinct().map(String::valueOf).toArray(String[]::new); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RunningRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RunningRoomService.java index c6b7c0fb9..fbfed3745 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RunningRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RunningRoomService.java @@ -1,9 +1,9 @@ package com.accompany.business.service.room; -import com.accompany.core.service.base.BaseService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.RunningRoomVo; import com.accompany.common.redis.RedisKey; +import com.accompany.core.service.base.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/ShortCutRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/ShortCutRoomService.java index 457d891ca..82f07d3ce 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/ShortCutRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/ShortCutRoomService.java @@ -3,7 +3,6 @@ package com.accompany.business.service.room; import com.accompany.business.constant.LimitTypeEnum; import com.accompany.business.model.room.ShortcutRoom; import com.accompany.business.mybatismapper.room.ShortCutRoomMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.user.UsersService; import com.accompany.business.vo.MicUserVo; import com.accompany.business.vo.config.NewUserFastRoomConfig; @@ -11,6 +10,7 @@ import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.netease.util.NetEaseConstant; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/UserInOutRoomRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/UserInOutRoomRecordService.java index fc65b69cd..053b5f429 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/UserInOutRoomRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/UserInOutRoomRecordService.java @@ -5,7 +5,6 @@ import com.accompany.business.event.room.UserOutRoomEvent; import com.accompany.business.message.room.UserOutRoomMessage; import com.accompany.business.param.LeftChatRoomParam; import com.accompany.business.service.chat.ChatRoomManageService; -import com.accompany.business.service.chat.ChatRoomService; import com.accompany.business.service.user.UserInRoomService; import com.accompany.common.redis.RedisKey; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateMaxGiftValueServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateMaxGiftValueServiceImpl.java index f8011a84a..de81430ed 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateMaxGiftValueServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateMaxGiftValueServiceImpl.java @@ -7,9 +7,9 @@ import com.accompany.business.dto.QueueDTO; import com.accompany.business.dto.QueueListResponseDTO; import com.accompany.business.dto.QueueValueDTO; import com.accompany.business.enums.GenderArea; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.*; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java index daa44a3b1..107bb8f88 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java @@ -15,7 +15,6 @@ import com.accompany.business.mybatismapper.hall.HallSuperManageBizMapper; import com.accompany.business.mybatismapper.room.CrossRoomPkRoundMapper; import com.accompany.business.param.InviteParam; import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.netease.YidunCheckUtil; import com.accompany.business.service.room.*; @@ -27,6 +26,7 @@ import com.accompany.business.vo.hall.ClanSuperManageListVO; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.common.netease.neteaseacc.result.RubbishRet; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelAwardServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelAwardServiceImpl.java index 6ab17039c..7f2c6ae68 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelAwardServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelAwardServiceImpl.java @@ -1,7 +1,6 @@ package com.accompany.business.service.room.impl; import com.accompany.business.constant.RoomBoomConstant; -import com.accompany.business.dto.room.RoomBoomLevelAwardDto; import com.accompany.business.model.room.RoomBoomLevelAward; import com.accompany.business.mybatismapper.room.RoomBoomLevelAwardMapper; import com.accompany.business.service.room.RoomBoomLevelAwardService; @@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelServiceImpl.java index bb1ffd436..fac99a11d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomLevelServiceImpl.java @@ -1,7 +1,6 @@ package com.accompany.business.service.room.impl; import com.accompany.business.constant.RoomBoomConstant; -import com.accompany.business.model.guild.GuildDiamondWage; import com.accompany.business.model.room.RoomBoomLevel; import com.accompany.business.mybatismapper.room.RoomBoomLevelMapper; import com.accompany.business.service.room.RoomBoomLevelService; @@ -12,11 +11,9 @@ import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; -import org.redisson.client.codec.IntegerCodec; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java index 12080ffe1..a62dc6e5e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java @@ -3,7 +3,6 @@ package com.accompany.business.service.room.impl; import cn.hutool.core.date.DateUtil; import com.accompany.business.common.constant.RewardTypeEnum; import com.accompany.business.common.dto.RewardDto; -import com.accompany.business.constant.PrizeTypeEnum; import com.accompany.business.constant.RoomBoomConstant; import com.accompany.business.dto.room.RoomBoomPrizeMsgDTO; import com.accompany.business.model.room.RoomBoomAwardRecord; @@ -34,7 +33,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.function.Function; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java index 714401b2f..6053bc9e0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java @@ -16,7 +16,6 @@ import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; -import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomMemberServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomMemberServiceImpl.java index eb6e9df1f..65a791489 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomMemberServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomMemberServiceImpl.java @@ -2,8 +2,8 @@ package com.accompany.business.service.room.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomMemberService; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomMemberRet; import com.accompany.common.netease.neteaseacc.result.RoomUserListRet; import com.accompany.common.netease.util.NetEaseConstant; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java index bf6f23fa4..bc5f01e0a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/SingleBroadcastPopularityServiceImpl.java @@ -39,13 +39,11 @@ import com.google.gson.reflect.TypeToken; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; - -import javax.validation.constraints.NotNull; - import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.util.*; import java.util.function.Function; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabHomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabHomeService.java index 68cef7b53..8d9fd7e40 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabHomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabHomeService.java @@ -1,29 +1,18 @@ package com.accompany.business.service.roomtab; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.StrUtil; import com.accompany.business.model.roomtab.RoomTabHome; import com.accompany.business.mybatismapper.RoomTabHomeMapper; -import com.accompany.business.mybatismapper.RoomTabMapper; -import com.accompany.business.service.home.HomeIndexService; -import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.roomtab.RoomTabHomeVo; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.ListUtil; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.PartitionInfo; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.Date; +import java.util.HashMap; @Service public class RoomTabHomeService extends ServiceImpl { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabMapService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabMapService.java index b60aac3ff..f7c93a766 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabMapService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabMapService.java @@ -1,11 +1,9 @@ package com.accompany.business.service.roomtab; -import com.accompany.business.model.roomtab.RoomTab; import com.accompany.business.model.roomtab.RoomTabHome; import com.accompany.business.model.roomtab.RoomTabMap; import com.accompany.business.mybatismapper.RoomTabHomeMapper; import com.accompany.business.mybatismapper.RoomTabMapMapper; -import com.accompany.business.mybatismapper.RoomTabMapper; import com.accompany.business.vo.roomtab.RoomTabMapVo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; @@ -13,14 +11,11 @@ import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.Account; import com.accompany.core.service.account.AccountService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.stream.Collectors; @Service public class RoomTabMapService extends ServiceImpl { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabService.java index 2c878f1d1..4dbe5640c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/RoomTabService.java @@ -2,21 +2,9 @@ package com.accompany.business.service.roomtab; import com.accompany.business.model.roomtab.RoomTab; import com.accompany.business.mybatismapper.RoomTabMapper; -import com.accompany.business.vo.roomtab.RoomTabVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.service.SysConfService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - @Service public class RoomTabService extends ServiceImpl { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java index 0833f40e3..4f999d0ac 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinPreWarningService.java @@ -3,14 +3,14 @@ package com.accompany.business.service.seekelfin; import com.accompany.business.dto.seekElfin.SeekElfinBroadCastDTO; import com.accompany.business.dto.seekElfin.SeekElfinGoldPreWarningDTO; import com.accompany.business.dto.seekElfin.SeekElfinPreWarningConfig; -import com.accompany.common.push.MarkdownMessage; import com.accompany.business.mybatismapper.seekelfin.SeekElfinPreWarningMapper; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.business.util.seekelfin.SeekElfinUtil; import com.accompany.common.config.WebSecurityConfig; import com.accompany.common.constant.Constant; +import com.accompany.common.push.MarkdownMessage; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.message.MessageRobotPushService; import com.alibaba.fastjson.JSON; import com.google.common.collect.ImmutableMap; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinRoomTipService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinRoomTipService.java index f9472d863..9358296a3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinRoomTipService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinRoomTipService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.seekelfin; import com.accompany.business.dto.seekElfin.SeekElfinRoomTipConfigDTO; import com.accompany.business.dto.seekElfin.req.SeekElfinResultReqDTO; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; @@ -11,6 +10,7 @@ import com.accompany.business.vo.seekelfin.SeekElfinRoomMessage; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinService.java index bba446b82..34c0033ed 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/SeekElfinService.java @@ -1,12 +1,14 @@ package com.accompany.business.service.seekelfin; import com.accompany.business.dto.seekElfin.req.SeekElfinResultReqDTO; -import com.accompany.business.dto.seekElfin.resp.*; +import com.accompany.business.dto.seekElfin.resp.SeekElfinLimitDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinProdDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinRecordPageRespDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinResultRespDTO; import com.accompany.business.param.seekelfin.SeekElfinBasePageParam; import com.accompany.common.device.DeviceInfo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import javax.servlet.http.HttpServletRequest; import java.util.List; public interface SeekElfinService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/impl/SeekElfinServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/impl/SeekElfinServiceImpl.java index 917b5a2b5..1a9157428 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/impl/SeekElfinServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/impl/SeekElfinServiceImpl.java @@ -3,7 +3,10 @@ package com.accompany.business.service.seekelfin.impl; import com.accompany.business.dto.seekElfin.SeekElfinConfigDTO; import com.accompany.business.dto.seekElfin.SeekElfinResDTO; import com.accompany.business.dto.seekElfin.req.SeekElfinResultReqDTO; -import com.accompany.business.dto.seekElfin.resp.*; +import com.accompany.business.dto.seekElfin.resp.SeekElfinLimitDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinProdDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinRecordPageRespDTO; +import com.accompany.business.dto.seekElfin.resp.SeekElfinResultRespDTO; import com.accompany.business.model.Gift; import com.accompany.business.model.Headwear; import com.accompany.business.model.HeadwearExample; @@ -26,8 +29,6 @@ import com.accompany.business.service.seekelfin.SeekElfinRoomTipService; import com.accompany.business.service.seekelfin.SeekElfinService; import com.accompany.business.service.user.UserBackpackService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.util.seekelfin.SeekElfinUtil; import com.accompany.business.vo.seekelfin.SeekElfinHeadwearVo; import com.accompany.common.constant.Constant; @@ -35,6 +36,8 @@ import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.common.utils.UUIDUtil; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.CurrencyEnum; import com.accompany.core.exception.ServiceException; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/singleroom/SingleRoomTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/singleroom/SingleRoomTaskService.java index 926064b3d..261634171 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/singleroom/SingleRoomTaskService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/singleroom/SingleRoomTaskService.java @@ -11,18 +11,18 @@ package com.accompany.business.service.singleroom; import com.accompany.business.model.room.SingleBroadcastPopularity; -import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.core.service.partition.PartitionInfoService; import com.accompany.business.service.rank.SingleRoomRankService; import com.accompany.business.service.room.SingleBroadcastPopularityService; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.model.PartitionInfo; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; +import com.accompany.core.service.partition.PartitionInfoService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/skillcard/impl/SkillCardUserPropServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/skillcard/impl/SkillCardUserPropServiceImpl.java index b5d7665ab..a1d6b1972 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/skillcard/impl/SkillCardUserPropServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/skillcard/impl/SkillCardUserPropServiceImpl.java @@ -1,6 +1,5 @@ package com.accompany.business.service.skillcard.impl; -import cn.hutool.core.util.ObjectUtil; import com.accompany.business.model.skillcard.SkillCardPropDict; import com.accompany.business.model.skillcard.SkillCardUserProp; import com.accompany.business.mybatismapper.skillcard.SkillCardUserPropMapper; @@ -20,7 +19,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.function.Consumer; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/treasure/SeizeTreasureService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/treasure/SeizeTreasureService.java index b21ba5496..0ceb99682 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/treasure/SeizeTreasureService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/treasure/SeizeTreasureService.java @@ -22,18 +22,14 @@ import com.accompany.business.service.level.LevelService; import com.accompany.business.service.nameplate.UserNameplateService; import com.accompany.business.service.purse.UserPurseService; import com.accompany.business.service.resource.ResourceService; -import com.accompany.business.service.user.UserActPropertyInfoRecordService; -import com.accompany.business.vo.treasure.SeizeTreasureSalvageConfig; -import com.accompany.business.vo.treasure.salvage.SeizeTreasureElfSalvageRecordVo; -import com.accompany.business.vo.treasure.salvage.SeizeTreasureElfSalvageReq; -import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.business.service.room.RoomService; +import com.accompany.business.service.user.UserActPropertyInfoRecordService; import com.accompany.business.service.user.UserActPropertyInfoV2Service; import com.accompany.business.service.user.UserBackpackService; import com.accompany.business.service.user.UsersService; -import com.accompany.core.base.SpringContextHolder; import com.accompany.business.vo.treasure.SeizeTreasureConfig; import com.accompany.business.vo.treasure.SeizeTreasurePoolItemVo; +import com.accompany.business.vo.treasure.SeizeTreasureSalvageConfig; import com.accompany.business.vo.treasure.compound.SeizeTreasureElfCompoundRecordVo; import com.accompany.business.vo.treasure.compound.SeizeTreasureElfCompoundReq; import com.accompany.business.vo.treasure.convert.SeizeTreasureConvertRecordVo; @@ -49,6 +45,8 @@ import com.accompany.business.vo.treasure.record.SeizeTreasureStaticVo; import com.accompany.business.vo.treasure.reward.SeizeTreasurePoolRewardCache; import com.accompany.business.vo.treasure.reward.SeizeTreasurePoolRewardVo; import com.accompany.business.vo.treasure.reward.SeizeTreasureRewardBaseVo; +import com.accompany.business.vo.treasure.salvage.SeizeTreasureElfSalvageRecordVo; +import com.accompany.business.vo.treasure.salvage.SeizeTreasureElfSalvageReq; import com.accompany.business.vo.treasure.userinfo.SeizeTreasureUserDrawInfo; import com.accompany.business.vo.treasure.userinfo.SeizeTreasureUserElfInfo; import com.accompany.business.vo.treasure.userinfo.SeizeTreasureUserForestInfo; @@ -63,12 +61,14 @@ import com.accompany.common.model.PageReq; import com.accompany.common.push.MarkdownMessage; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; +import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.vo.UserLevelVo; import com.alibaba.fastjson.JSON; import com.google.gson.Gson; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java index 7521ad44b..3cd37f2c6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java @@ -8,20 +8,19 @@ import com.accompany.business.mybatismapper.UserInviteCodeMapper; import com.accompany.business.service.room.RoomInviteCodeService; import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.RoomVo; -import com.accompany.common.constant.Constant; +import com.accompany.business.vo.user.InviteUserInRoomStatusVO; import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Room; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.core.vo.user.InvitePageVO; -import com.accompany.business.vo.user.InviteUserInRoomStatusVO; -import com.accompany.core.vo.user.InvitedUserVO; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.StringUtils; +import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.model.UsersExample; import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.base.BaseService; +import com.accompany.core.service.user.UsersBaseService; +import com.accompany.core.vo.user.InvitePageVO; +import com.accompany.core.vo.user.InvitedUserVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java index 822d09637..125bb208c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil; import com.accompany.business.model.PrivatePhoto; import com.accompany.business.model.PrivatePhotoExample; import com.accompany.business.mybatismapper.PrivatePhotoMapper; -import com.accompany.business.service.YidunCallbackService; import com.accompany.business.service.api.QinniuService; import com.accompany.common.config.YidunImageConfig; import com.accompany.common.constant.Constant; @@ -12,11 +11,9 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.EnvComponent; -import com.accompany.common.utils.UUIDUtil; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisService; import com.accompany.core.util.HttpClient4Utils; import com.accompany.core.util.YidunGeneralUtils; import com.accompany.core.vo.PrivatePhotoVo; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoV2Service.java index 2dca8ef0b..b1c022e49 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoV2Service.java @@ -2,10 +2,10 @@ package com.accompany.business.service.user; import com.accompany.business.model.PrivatePhoto; import com.accompany.business.mybatismapper.PrivatePhotoMapper; -import com.accompany.core.service.base.BaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.service.base.BaseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java index be08f344a..ee7801051 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxItemService.java @@ -4,12 +4,12 @@ import com.accompany.business.model.TopicBoxItem; import com.accompany.business.model.TopicBoxItemExample; import com.accompany.business.model.TopicBoxItemVo; import com.accompany.business.mybatismapper.TopicBoxItemMapper; +import com.accompany.common.redis.RedisKey; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; -import com.accompany.common.redis.RedisKey; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java index 4205ab3fb..8f19a719f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserDetailsService.java @@ -2,7 +2,6 @@ package com.accompany.business.service.user; import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.model.UserGiftWall; -import com.accompany.business.model.dress.PersonalBackground; import com.accompany.business.model.user.UserVisitRecord; import com.accompany.business.mybatismapper.UserNameplateMapper; import com.accompany.business.param.neteasepush.NeteasePushParam; @@ -244,7 +243,9 @@ public class UserDetailsService extends BaseService { cdl.countDown(); } }); + userDetailsVo.setUsingPersonalBackground(userPersonalBackgroundService.getUserUsingPersonalBackground(uid)); + try { cdl.await(5, TimeUnit.SECONDS); } catch (InterruptedException e) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserExpandService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserExpandService.java index b0cb7611c..12b7f2218 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserExpandService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserExpandService.java @@ -4,7 +4,6 @@ import com.accompany.business.model.UserExpand; import com.accompany.business.model.UserExpandExample; import com.accompany.business.mybatismapper.UserExpandMapper; import com.accompany.business.mybatismapper.UserExpandMapperExpand; -import com.accompany.core.service.region.RegionService; import com.accompany.business.vo.user.MsgNotifyVo; import com.accompany.business.vo.user.PrivacyVo; import com.accompany.common.constant.ApplicationConstant; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java index e8456e125..0f8c32978 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java @@ -5,7 +5,6 @@ import com.accompany.business.model.UserGiftWall; import com.accompany.business.model.UserGiftWallExample; import com.accompany.business.model.giftAchievement.*; import com.accompany.business.mybatismapper.*; -import com.accompany.business.service.gift.GiftService; import com.accompany.business.vo.giftAchievement.GiftAchievementExpandVo; import com.accompany.business.vo.giftAchievement.GiftAchievementTypeVo; import com.accompany.common.constant.Constant; @@ -17,7 +16,6 @@ import com.accompany.core.util.StringUtils; import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java index 4dc737305..a5250b7a5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java @@ -19,7 +19,6 @@ import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.GsonUtil; -import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteCodeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteCodeService.java index 0ba105adf..55e4692e1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteCodeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteCodeService.java @@ -7,7 +7,6 @@ import com.accompany.business.util.QrCodeUtil; import com.accompany.common.constant.AppEnum; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.accompany.common.utils.EnvComponent; -import com.accompany.common.utils.UUIDUtil; import com.accompany.core.base.SpringContextHolder; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteFissionRewardRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteFissionRewardRecordService.java index d25f53e90..c206e5602 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteFissionRewardRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteFissionRewardRecordService.java @@ -22,7 +22,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteRecordService.java index 2602b6ec9..b6e986995 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteRecordService.java @@ -7,7 +7,7 @@ import com.accompany.business.vo.UserInviteRecordVo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users;; +import com.accompany.core.model.Users; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,6 +18,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +; + /** * 2 * @Author: zhuct * 3 * @Date: 2018/10/26 15:23 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteService.java index 3c95aca4d..86fde2aa8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInviteService.java @@ -8,7 +8,6 @@ import com.accompany.business.mybatismapper.UserInviteFissionRewardRecordMapper; import com.accompany.business.vo.invite.UserInviteProfitVo; import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.PartitionUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserMagicWallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserMagicWallService.java index bfb28eb29..2e7bf9bcf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserMagicWallService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserMagicWallService.java @@ -5,8 +5,8 @@ import com.accompany.business.model.UserMagicWall; import com.accompany.business.model.UserMagicWallExample; import com.accompany.business.mybatismapper.UserMagicWallMapper; import com.accompany.business.mybatismapper.UserMagicWallMapperMgr; -import com.accompany.core.service.base.BaseService; import com.accompany.business.service.gift.GiftMagicService; +import com.accompany.core.service.base.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java index 3b5af88b9..2c1193d4c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java @@ -1,6 +1,6 @@ package com.accompany.business.service.user; -import com.accompany.business.model.*; +import com.accompany.business.model.UserShareRecord; import com.accompany.business.mybatismapper.UserShareRecordMapper; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserNameplateApplyRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserNameplateApplyRecordServiceImpl.java index b433d1c8e..ec029e2c9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserNameplateApplyRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserNameplateApplyRecordServiceImpl.java @@ -5,7 +5,6 @@ import com.accompany.business.mybatismapper.user.UserNameplateApplyRecordMapper; import com.accompany.business.service.user.UserNameplateApplyRecordService; import com.accompany.common.constant.Constant; 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 lombok.NonNull; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipBizService.java index 444e2ca1d..426dc1c11 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipBizService.java @@ -10,15 +10,15 @@ */ package com.accompany.business.service.vip; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.accompany.business.constant.nameplate.NameplateStyleTypeEnum; import com.accompany.business.dto.vip.VipOldDressDTO; import com.accompany.business.model.NameplateAuditRecord; -import com.accompany.business.model.vip.*; +import com.accompany.business.model.vip.VipAuthInfo; +import com.accompany.business.model.vip.VipAuthItem; +import com.accompany.business.model.vip.VipInfo; import com.accompany.business.mybatismapper.NameplateAuditRecordMapper; import com.accompany.business.mybatismapper.vip.VipInfoMapper; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.car.CarportService; import com.accompany.business.service.dress.UserChatBubbleBizService; import com.accompany.business.service.dress.UserInfoCardBizService; @@ -29,9 +29,13 @@ import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.VipUtil; import com.accompany.business.vo.nameplate.NameplateAuditRecordVo; -import com.accompany.business.vo.vip.*; +import com.accompany.business.vo.vip.VipNameplateVo; +import com.accompany.business.vo.vip.VipPageVO; +import com.accompany.business.vo.vip.VipRoomHornVO; +import com.accompany.business.vo.vip.VipWithAuthVO; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; @@ -44,15 +48,11 @@ import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.vip.VipBaseInfoVO; import com.accompany.payment.model.UserVipInfo; -import com.accompany.payment.model.UserVipRecord; import com.accompany.payment.service.UserVipInfoService; -import com.accompany.payment.service.UserVipRecordService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java index d214a7be9..d88469cbb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java @@ -16,7 +16,6 @@ import com.accompany.business.model.vip.VipInfo; import com.accompany.business.param.neteasepush.NeteasePushParam; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.param.neteasepush.Payload; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.room.RoomQueryService; import com.accompany.business.service.room.RoomService; @@ -26,6 +25,7 @@ import com.accompany.business.vo.vip.VipMessageVO; import com.accompany.common.config.SystemConfig; import com.accompany.common.constant.Attach; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.enumeration.I18nAlertEnum; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipRankService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipRankService.java index 8c8564124..eabab4535 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipRankService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipRankService.java @@ -7,16 +7,13 @@ import com.accompany.business.util.VipUtil; import com.accompany.business.vo.vip.VipRankListVO; import com.accompany.business.vo.vip.VipUpgradeBroadListVO; import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.StringUtils; -import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.vip.UserVipInfoVO; import com.accompany.core.vo.vip.VipBaseInfoVO; import com.accompany.payment.model.UserVipInfo; import com.accompany.payment.service.UserVipInfoService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipTaskService.java index fb03e0893..d91f4a17a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipTaskService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipTaskService.java @@ -10,13 +10,9 @@ */ package com.accompany.business.service.vip; -import com.accompany.business.dto.vip.VipMessageConfigDTO; import com.accompany.business.model.vip.VipInfo; -import com.accompany.business.util.VipUtil; -import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisService; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/impl/VipReturnProfitRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/impl/VipReturnProfitRecordServiceImpl.java index 8ac7778a4..008696f8a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/impl/VipReturnProfitRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/impl/VipReturnProfitRecordServiceImpl.java @@ -16,7 +16,6 @@ import com.accompany.core.base.UidContextHolder; import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; import com.accompany.payment.model.UserVipRecord; -import com.accompany.payment.service.UserVipInfoService; import com.accompany.payment.service.UserVipRecordService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java index 1d65f8758..0c72f28f0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawUserAccountService.java @@ -6,7 +6,6 @@ import com.accompany.business.model.withdraw.WithdrawUserAccount; import com.accompany.business.vo.withdraw.WithdrawUserAccountVo; import com.baomidou.mybatisplus.extension.service.IService; -import java.math.BigDecimal; import java.util.List; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java index c3d6e1a60..6afe3df54 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java @@ -15,19 +15,18 @@ import com.accompany.business.vo.withdraw.WithdrawUserAccountVo; import com.accompany.common.constant.Constant; import com.accompany.common.status.BusiStatus; import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.enumeration.CurrencyEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import javax.validation.constraints.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java index 4744488ef..f44b861a7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java @@ -1,37 +1,28 @@ package com.accompany.business.service.world; -import com.accompany.business.sensitvienew.SensitiveFilterUtil; -import com.accompany.business.service.user.UsersService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; -import com.accompany.world.bo.WorldBo; import com.accompany.world.common.ParamUtils; import com.accompany.world.common.WorldException; import com.accompany.world.constant.WorldConstant; -import com.accompany.world.entity.*; +import com.accompany.world.entity.World; +import com.accompany.world.entity.WorldType; import com.accompany.world.query.WorldQuery; -import com.accompany.world.service.*; +import com.accompany.world.service.IWorldService; import com.accompany.world.vo.*; 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.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.*; -import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; /** diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java index c43d923c2..7553bd952 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java @@ -1,14 +1,14 @@ package com.accompany.business.service.world; +import com.accompany.common.redis.RedisKey; import com.accompany.core.service.base.BaseService; -import com.google.gson.reflect.TypeToken; import com.accompany.world.constant.WorldConstant; import com.accompany.world.entity.WorldType; import com.accompany.world.query.WorldQuery; import com.accompany.world.service.IWorldService; import com.accompany.world.service.IWorldTypeService; import com.accompany.world.vo.WorldTypeVo; -import com.accompany.common.redis.RedisKey; +import com.google.gson.reflect.TypeToken; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java index a55c942da..eedb6dc84 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java @@ -3,7 +3,6 @@ package com.accompany.business.util; import cn.hutool.core.date.DateUtil; import com.accompany.business.vo.guild.CycleDateVo; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.PartitionEnum; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java index a6e516c5b..942c1c237 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/config/WebMVCConfig.java @@ -3,7 +3,10 @@ package com.accompany.business.config; import com.accompany.business.interceptor.*; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class WebMVCConfig implements WebMvcConfigurer { diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/AutoGenRobotController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/AutoGenRobotController.java index 45b97ee08..e16722433 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/AutoGenRobotController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/AutoGenRobotController.java @@ -1,22 +1,14 @@ package com.accompany.business.controller; import com.accompany.business.service.AutoGenRobotService; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; - /** * Created by liuguofu on 2017/8/10. * FIXME: 没有权限校验，存在安全隐患 diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java index 1916aefa5..6e1e8cdbf 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java @@ -3,7 +3,6 @@ package com.accompany.business.controller; import com.accompany.business.service.api.QinniuService; import com.accompany.common.annotation.Authorization; import com.accompany.common.annotation.H5Authorization; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TencentCosController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TencentCosController.java index c9c9e4f2c..1342ae8ba 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TencentCosController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/TencentCosController.java @@ -1,7 +1,6 @@ package com.accompany.business.controller; import com.accompany.business.common.BaseController; -import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.tencent.cos.TencentCosTempToken; import com.accompany.common.tencent.cos.TencentCosUploadService; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java index 6265b5fb8..2b95d00ad 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActCallBattleController.java @@ -15,7 +15,6 @@ import com.accompany.business.model.callbattle.ActCallBattleInfo; import com.accompany.business.param.callbattle.ActCallBattleDrawParams; import com.accompany.business.service.callbattle.ActCallBattleBizService; import com.accompany.business.vo.callbattle.*; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseRequestVO; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java index 28a8e2fc5..4151aaa7d 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesLuckySeaController.java @@ -1,8 +1,8 @@ package com.accompany.business.controller.activities; import com.accompany.business.common.BaseController; -import com.accompany.business.dto.luckysea.LuckySeaActConfig; import com.accompany.business.constant.activities.ActivitesPackTypeEnum; +import com.accompany.business.dto.luckysea.LuckySeaActConfig; import com.accompany.business.model.ActivityPack; import com.accompany.business.model.activity.luckysea.LuckySeaActInfo; import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; @@ -14,7 +14,6 @@ import com.accompany.business.vo.activities.LuckySeaActInfoVo; import com.accompany.business.vo.activities.LuckySeaActUserDrawItemVO; import com.accompany.common.annotation.Authorization; import com.accompany.common.status.BusiStatus; - import com.accompany.core.exception.ServiceException; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; @@ -23,7 +22,10 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/WeekStarController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/WeekStarController.java index 06ae99db8..8c4137727 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/WeekStarController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/WeekStarController.java @@ -2,22 +2,17 @@ package com.accompany.business.controller.activity; import com.accompany.business.common.BaseController; import com.accompany.business.service.activity.WeekStarService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.activity.weekstar.WeekStarAwardList; import com.accompany.business.vo.activity.weekstar.WeekStarParentVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.base.UidContextHolder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @Author yuanyi diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/ActivityOfCpController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/ActivityOfCpController.java index 6ceb51e2b..26ddfade1 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/ActivityOfCpController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/ActivityOfCpController.java @@ -6,15 +6,12 @@ import com.accompany.business.service.activity.h5.ActivityOfCpService; import com.accompany.business.vo.activity.h5.ActivityH5CpRankVo; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.vo.BaseResponseVO; -import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; - import static com.accompany.common.constant.ApplicationConstant.PublicParameters.PUB_UID; /** diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/SSGuildController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/SSGuildController.java index 4e1b1d1ab..dfdb08eb8 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/SSGuildController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/h5/SSGuildController.java @@ -3,7 +3,6 @@ package com.accompany.business.controller.activity.h5; import com.accompany.business.service.guild.SSGuildService; import com.accompany.business.vo.guild.GuildSSRankVo; import com.accompany.common.result.BusiResult; -import com.accompany.core.enumeration.PartitionEnum; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/GooglePlayBillingChargeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/GooglePlayBillingChargeController.java index 1bdacea04..30cbc171e 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/GooglePlayBillingChargeController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/GooglePlayBillingChargeController.java @@ -6,7 +6,6 @@ import com.accompany.common.annotation.Authorization; import com.accompany.common.device.DeviceInfo; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.IPUtils; - import com.accompany.core.vo.BaseResponseVO; import com.accompany.payment.dto.AppInnerPayRecordDTO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java index a22fa7042..a266770fd 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java @@ -8,8 +8,8 @@ import com.accompany.common.utils.IPUtils; import com.accompany.payment.mycard.dto.CallbackDto; import com.accompany.payment.mycard.dto.ReplenishDto; import com.accompany.payment.mycard.resp.QueryOrderResp; -import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/StartPayController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/StartPayController.java index 9390ecbea..928779ecd 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/StartPayController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/StartPayController.java @@ -16,7 +16,10 @@ import org.apache.commons.lang3.StringUtils; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.time.Instant; import java.util.Date; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/back/RoomManageController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/back/RoomManageController.java index b4738cac4..9eacaa48d 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/back/RoomManageController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/back/RoomManageController.java @@ -1,8 +1,8 @@ package com.accompany.business.controller.back; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.model.Users; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxRuleController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxRuleController.java index e64e4a992..304f93708 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxRuleController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxRuleController.java @@ -2,7 +2,6 @@ package com.accompany.business.controller.box; import com.accompany.business.service.box.OpenBoxRuleService; import com.accompany.business.vo.PrizePoolItemRuleVo; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/FirstChargeRewardController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/FirstChargeRewardController.java index 935e8aa3e..d7b20f892 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/FirstChargeRewardController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/FirstChargeRewardController.java @@ -6,7 +6,6 @@ import com.accompany.business.vo.FirstChargeVo; import com.accompany.business.vo.firstcharge.LimitFirstChargeVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.device.DeviceInfo; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import com.accompany.payment.model.ChargeRecord; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/LuckyTarotChargeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/LuckyTarotChargeController.java index e9b34bd35..d49f1ff50 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/LuckyTarotChargeController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/LuckyTarotChargeController.java @@ -9,7 +9,6 @@ import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.AppVersionUtil; import com.accompany.common.utils.IPUtils; import com.accompany.common.utils.StringUtils; - import com.accompany.core.vo.BaseRequestVO; import com.accompany.core.vo.BaseResponseVO; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/ChatRoomController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/ChatRoomController.java index ee0635cfb..8232c001d 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/ChatRoomController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/ChatRoomController.java @@ -1,7 +1,6 @@ package com.accompany.business.controller.chat; import com.accompany.business.service.chat.ChatRoomManageService; -import com.accompany.business.service.chat.ChatRoomService; import com.accompany.business.vo.chat.ChatRoomVo; import com.accompany.common.result.BusiResult; import com.accompany.core.base.UidContextHolder; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java index 515ef0e50..18499fdac 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/chat/PublicChatTopRecordController.java @@ -1,6 +1,5 @@ package com.accompany.business.controller.chat; -import com.accompany.business.model.chat.PublicChatTopRecord; import com.accompany.business.service.chat.PublicChatTopRecordService; import com.accompany.business.vo.chat.PublicChatTopRecordVo; import com.accompany.common.result.BusiResult; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanAccountAssociateController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanAccountAssociateController.java index eb774a90c..ca310ecd0 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanAccountAssociateController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanAccountAssociateController.java @@ -3,7 +3,6 @@ package com.accompany.business.controller.clan; import com.accompany.business.common.BaseController; import com.accompany.business.service.clan.ClanAccountAssociateService; import com.accompany.business.vo.clan.ClanAssociateRoomVo; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanController.java index 35204ee8a..80d3cd1bb 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanController.java @@ -3,13 +3,11 @@ package com.accompany.business.controller.clan; import com.accompany.business.common.BaseController; import com.accompany.business.service.clan.ClanService; import com.accompany.business.vo.clan.ClanAndHallVO; -import com.accompany.business.vo.clan.ClanRankListVO; import com.accompany.business.vo.clan.ClanVO; import com.accompany.business.vo.hall.HallVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -19,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.validation.constraints.NotNull; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanIncomeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanIncomeController.java index 214123b00..6dfbcd1b5 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanIncomeController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanIncomeController.java @@ -15,7 +15,6 @@ import com.accompany.business.service.clan.ClanIncomeService; import com.accompany.business.vo.clan.ClanHallMemberIncomeTotalVO; import com.accompany.business.vo.clan.ClanIncomeTotalVO; import com.accompany.common.annotation.Authorization; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/dress/UserInfoCardController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/dress/UserInfoCardController.java index a4929bd22..3fe32a0fb 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/dress/UserInfoCardController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/dress/UserInfoCardController.java @@ -14,7 +14,6 @@ import com.accompany.business.common.BaseController; import com.accompany.business.service.dress.UserInfoCardBizService; import com.accompany.business.vo.dress.UserInfoCardVO; import com.accompany.common.annotation.Authorization; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/ExchangeDiamondGoldRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/ExchangeDiamondGoldRecordController.java index 939b8db45..c39e27309 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/ExchangeDiamondGoldRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/exchange/ExchangeDiamondGoldRecordController.java @@ -2,7 +2,6 @@ package com.accompany.business.controller.exchange; import com.accompany.business.common.BaseController; import com.accompany.business.service.record.ExchangeDiamondGoldRecordService; -import com.accompany.common.utils.RSAUtils; import com.accompany.business.vo.UserPurseVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.annotation.H5Authorization; @@ -12,6 +11,7 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DESUtils; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.common.utils.RSAUtils; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java index 7031fe71b..e739a962e 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerOrderController.java @@ -7,7 +7,6 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java index 040ea20b8..f2e4ad89d 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gamepartner/GamePartnerUserController.java @@ -1,9 +1,7 @@ package com.accompany.business.controller.gamepartner; import com.accompany.business.service.gamepartner.GamePartnerUserService; -import com.accompany.business.service.gamepartner.UserGamePartnerInfoService; import com.accompany.business.vo.gamepartner.GamePartnerUserInfoVo; -import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; @@ -18,8 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Api(tags = "游戏点单") @RestController @RequestMapping("/gamePartnerInfo") diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java index 0af899ee6..d06a80929 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/gift/GiftV2Controller.java @@ -18,8 +18,6 @@ import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.util.StringUtils; @@ -35,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildUsdRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildUsdRecordController.java index 6e288bf13..d109a5c3f 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildUsdRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildUsdRecordController.java @@ -1,7 +1,6 @@ package com.accompany.business.controller.guild; import com.accompany.business.service.guild.GuildUsdBillRecordService; -import com.accompany.business.vo.guild.GuildMemberDiamondWithdrawVo; import com.accompany.business.vo.guild.GuildUsdBillRecordVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallAuthController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallAuthController.java index 2b7e75fe6..b0ae63554 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallAuthController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallAuthController.java @@ -18,11 +18,9 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallSuperManageController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallSuperManageController.java index a3be93bae..bef6ccd72 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallSuperManageController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallSuperManageController.java @@ -17,7 +17,6 @@ import com.accompany.business.vo.hall.ClanSuperManageListVO; import com.accompany.business.vo.hall.HallForSuperManageSetVO; import com.accompany.business.vo.hall.HallSuperManageSearchResVO; import com.accompany.common.annotation.Authorization; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java index 6ac6327e7..d15800b85 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java @@ -3,9 +3,6 @@ package com.accompany.business.controller.home; import com.accompany.business.common.BaseController; import com.accompany.business.service.client.ClientService; import com.accompany.business.vo.AppConfigVo; -import com.accompany.business.vo.AppInitVo; -import com.accompany.business.vo.PropVo; -import com.accompany.common.config.SystemConfig; import com.accompany.common.result.BusiResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeController.java index 08aed7c9f..db9586637 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeController.java @@ -12,7 +12,6 @@ import com.accompany.business.vo.firstpage.FirstPageBannerVo; import com.accompany.business.vo.firstpage.SecondPageBannerVo; import com.accompany.business.vo.home.*; import com.accompany.business.vo.roomtab.HomeRoomTabVo; -import com.accompany.business.vo.roomtab.TopRoomTabHomeVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; import com.accompany.common.result.BusiResult; @@ -94,19 +93,6 @@ public class HomeController extends BaseController { return new BusiResult<>(playRoomVos); } - - @ApiOperation("首页改版4.0.0：获取首页推荐房间") - @GetMapping(value = "/tab/mapV2") - @ApiImplicitParams({ - @ApiImplicitParam(name = "tabId", value = "tabId", required = false, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageNum", value = "第几页", required = false, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "pageSize", value = "每页大小", required = false, dataType = "Integer", paramType = "query") - }) - public BusiResult> getRoomTabMapListV2(Long tabId, Integer pageNum, Integer pageSize) throws Exception { - List playRooms = homeService.hotRoom(UidContextHolder.get(), DeviceInfoContextHolder.get()); - return new BusiResult<>(playRooms); - } - @ApiOperation("获取一个首页推荐房间uid") @GetMapping(value = "/tab/home/one") public BusiResult getRoomTabHomeOne() { @@ -114,24 +100,6 @@ public class HomeController extends BaseController { return new BusiResult<>(roomUid); } - @ApiOperation("首页改版4.0.0-热门房间") - @Authorization - @GetMapping(value = "/hotRoom") - public BusiResult> hotRoom() { - return BusiResult.success(homeService.hotRoom(this.getUid(), getDeviceInfo(request))); - } - - @ApiOperation("首页改版4.0.0-派对tab(交友、开黑、点唱)，4.0.0版本开始使用") - @GetMapping(value = "/tab/homeV2") - public BusiResult> getRoomTabHomeListV2(@RequestParam(defaultValue = "1") Integer tabId, - @RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "50") Integer pageSize) throws Exception { - //兼容iOS分页问题，固定50 - pageSize = 50; - List list = homeService.getRoomTabHomeListV2(tabId, pageNum, pageSize, this.getUid(), getDeviceInfo(request)); - return new BusiResult<>(list); - } - @ApiOperation("首页改版4.0.0:派对tab获取") @GetMapping(value = "/tagV2") public BusiResult> getHomeRoomTabListV2() { diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeV2Controller.java index 4dac9707b..42fceb065 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeV2Controller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/HomeV2Controller.java @@ -5,7 +5,7 @@ import com.accompany.business.service.home.HomeRankService; import com.accompany.business.service.homeV2.HomeV2Service; import com.accompany.business.service.homeV2.filter.HomeRoomFilterEnum; import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.home.PlayRoomVo; +import com.accompany.business.vo.home.HomeRoomVo; import com.accompany.business.vo.home.SimplePlayRoomVo; import com.accompany.business.vo.roomtab.HomeRoomTabVo; import com.accompany.common.annotation.Authorization; @@ -58,9 +58,9 @@ public class HomeV2Controller { @ApiImplicitParam(name = "pageNum", value = "第几页", dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "Integer", paramType = "query") }) - public BusiResult> pageRoomTab(Long tabId, Integer pageNum, Integer pageSize) { + public BusiResult> pageRoomTab(Long tabId, Integer pageNum, Integer pageSize) { Long uid = UidContextHolder.get(); - List playRooms = service.pageRoomTab(uid, tabId, pageNum, pageSize); + List playRooms = service.pageRoomTab(uid, tabId, pageNum, pageSize); return new BusiResult<>(playRooms); } @@ -80,9 +80,9 @@ public class HomeV2Controller { @ApiImplicitParam(name = "pageNum", value = "第几页", dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "Integer", paramType = "query") }) - public BusiResult> pageRecentlyRoom(Integer pageNum, Integer pageSize) { + public BusiResult> pageRecentlyRoom(Integer pageNum, Integer pageSize) { Long uid = UidContextHolder.get(); - List playRooms = service.pageRoom(uid, + List playRooms = service.pageRoom(uid, pageNum, pageSize, HomeRoomFilterEnum.Recently.name(), null); return new BusiResult<>(playRooms); @@ -95,9 +95,9 @@ public class HomeV2Controller { @ApiImplicitParam(name = "pageNum", value = "第几页", dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "Integer", paramType = "query") }) - public BusiResult> pageCollectRoom(Integer pageNum, Integer pageSize) { + public BusiResult> pageCollectRoom(Integer pageNum, Integer pageSize) { Long uid = UidContextHolder.get(); - List playRooms = service.pageRoom(uid, + List playRooms = service.pageRoom(uid, pageNum, pageSize, HomeRoomFilterEnum.Collection.name(), null); return new BusiResult<>(playRooms); diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/linearlypool/LinearlyPoolController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/linearlypool/LinearlyPoolController.java index 3e4ccda22..a8eab5241 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/linearlypool/LinearlyPoolController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/linearlypool/LinearlyPoolController.java @@ -16,7 +16,6 @@ import com.accompany.business.vo.openbox.DrawPrizeItemVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - import com.accompany.core.exception.ServiceException; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/lucky/LuckyBagFortunateController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/lucky/LuckyBagFortunateController.java index 0858f0a68..7b55693ff 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/lucky/LuckyBagFortunateController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/lucky/LuckyBagFortunateController.java @@ -1,6 +1,5 @@ package com.accompany.business.controller.lucky; -import com.accompany.business.model.lucky.LuckyBagFortunateRecord; import com.accompany.business.service.lucky.LuckyBagFortunateRecordService; import com.accompany.business.service.lucky.LuckyBagFortunateService; import com.accompany.business.vo.lucky.LuckyBagFortunateRecordVo; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/miniGame/MiniGameController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/miniGame/MiniGameController.java index 6c7c1ec32..ee512a0e1 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/miniGame/MiniGameController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/miniGame/MiniGameController.java @@ -7,7 +7,6 @@ import com.accompany.business.constant.game.MiniGameRoomFlagConstant; import com.accompany.business.model.miniGame.MiniGame; import com.accompany.business.service.miniGame.MiniGameService; import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; import com.accompany.common.result.BusiResult; import com.accompany.core.base.UidContextHolder; import com.accompany.core.model.Room; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/partition/PartitionInfoController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/partition/PartitionInfoController.java index 24b6354e9..b1ce7ad97 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/partition/PartitionInfoController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/partition/PartitionInfoController.java @@ -1,12 +1,12 @@ package com.accompany.business.controller.partition; import com.accompany.business.common.BaseController; -import com.accompany.core.service.partition.PartitionInfoService; -import com.accompany.core.vo.partition.UserPartitionInfoVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; +import com.accompany.core.service.partition.PartitionInfoService; +import com.accompany.core.vo.partition.UserPartitionInfoVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/pretty/PrettyNumberController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/pretty/PrettyNumberController.java index 45c33120e..51c7676a1 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/pretty/PrettyNumberController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/pretty/PrettyNumberController.java @@ -2,12 +2,12 @@ package com.accompany.business.controller.pretty; import com.accompany.business.service.prettyno.PrettyNumberBizService; import com.accompany.business.vo.pretty.PrettyNumUserVo; -import com.accompany.core.vo.PrettyNumberVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.base.UidContextHolder; import com.accompany.core.exception.ServiceException; +import com.accompany.core.vo.PrettyNumberVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/region/RegionInfoController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/region/RegionInfoController.java index d26f2a86b..57accd111 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/region/RegionInfoController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/region/RegionInfoController.java @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/relation/RelationController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/relation/RelationController.java index 23ae138e7..ac49b1c15 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/relation/RelationController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/relation/RelationController.java @@ -4,7 +4,6 @@ import com.accompany.business.message.GiftMessage; import com.accompany.business.service.relation.RelationInfoService; import com.accompany.business.service.relation.RelationUserService; import com.accompany.common.result.BusiResult; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/resource/ResourceEffectController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/resource/ResourceEffectController.java index 03e861aee..068636e03 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/resource/ResourceEffectController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/resource/ResourceEffectController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.Set; /** diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBackgroundController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBackgroundController.java index 6b18cebdf..4177bd8c4 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBackgroundController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBackgroundController.java @@ -3,7 +3,6 @@ package com.accompany.business.controller.room; import com.accompany.business.service.room.RoomBackgroundService; import com.accompany.business.service.room.RoomMemberService; import com.accompany.business.service.room.RoomService; -import com.accompany.business.vo.room.RoomBackgroundItemVo; import com.accompany.business.vo.room.RoomBackgroundVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; @@ -14,9 +13,10 @@ import com.accompany.core.model.Room; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(value = "/room/background") diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java index cb43dc181..f19549f3f 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomBlindDateController.java @@ -7,12 +7,12 @@ import com.accompany.business.dto.blindDate.BlindDateRoundHistoryDTO; import com.accompany.business.enums.BlindDatePhaseStateEnum; import com.accompany.business.params.room.BlindDateConnectionRequest; import com.accompany.business.params.room.BlindDateStateChangeRequest; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.*; import com.accompany.business.vo.RoomNotifyVo; import com.accompany.business.vo.room.BlindDataConfigVO; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.core.annotation.LogTime; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java index 1bc28d3fc..ca9a684be 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomController.java @@ -17,7 +17,6 @@ import com.accompany.business.service.treasure.SeizeTreasureShardService; import com.accompany.business.service.user.UserBlackRecordService; import com.accompany.business.vo.RoomVo; import com.accompany.business.vo.redenvelope.RedEnvelopeResponseVo; -import com.accompany.sharding.vo.RoomSerialVo; import com.accompany.common.annotation.Authorization; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; @@ -28,6 +27,7 @@ import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.util.MD5; import com.accompany.core.util.StringUtils; +import com.accompany.sharding.vo.RoomSerialVo; import com.google.common.util.concurrent.RateLimiter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomGiftValueController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomGiftValueController.java index 3a4772e3f..8edd9ad52 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomGiftValueController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomGiftValueController.java @@ -2,8 +2,8 @@ package com.accompany.business.controller.room; import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.dto.QueueValueDTO; -import com.accompany.business.service.room.QueryRoomService; import com.accompany.business.service.room.BlindDateMaxGiftValueService; +import com.accompany.business.service.room.QueryRoomService; import com.accompany.business.service.room.RoomGiftValueService; import com.accompany.business.service.room.RoomService; import com.accompany.common.annotation.Authorization; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomInsideRecommendController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomInsideRecommendController.java index 30dd7172c..55ebba6bb 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomInsideRecommendController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomInsideRecommendController.java @@ -5,7 +5,6 @@ import com.accompany.business.common.BaseController; import com.accompany.business.service.room.RoomInsideRecommendService; import com.accompany.business.vo.home.PlayRoomVo; import com.accompany.common.status.BusiStatus; - import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomPKController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomPKController.java index 9e017d095..6925b1d36 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomPKController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomPKController.java @@ -19,7 +19,6 @@ import com.google.gson.reflect.TypeToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomQueueContoller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomQueueContoller.java index a4bf442e8..4a9f5e9a2 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomQueueContoller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomQueueContoller.java @@ -7,8 +7,6 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomRankingController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomRankingController.java index 004b3a46c..afc8cfb6f 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomRankingController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomRankingController.java @@ -7,11 +7,8 @@ import com.accompany.business.vo.room.PermitRoomHourRankVo; import com.accompany.business.vo.room.RoomRankShowVO; import com.accompany.business.vo.room.RoomRankingVo; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; - -import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.vo.BaseResponseVO; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomV2Controller.java index c0d832cbd..b92678132 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomV2Controller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/RoomV2Controller.java @@ -1,12 +1,10 @@ package com.accompany.business.controller.room; import com.accompany.business.common.BaseController; -import com.accompany.business.service.room.RoomCleanService; import com.accompany.business.service.room.RoomManageService; import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.RoomVo; import com.accompany.common.annotation.Authorization; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; @@ -15,14 +13,11 @@ import com.accompany.core.vo.UserVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.SneakyThrows; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/SingleBroadcastPopularityController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/SingleBroadcastPopularityController.java index 00d32cee2..dcd89776d 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/SingleBroadcastPopularityController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/room/SingleBroadcastPopularityController.java @@ -9,7 +9,6 @@ import com.accompany.business.vo.singleroom.SingleRoomHourRankVO; import com.accompany.common.annotation.Authorization; import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java index 9bac9ba9b..0f83ef1df 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/DiamondGiveHistoryController.java @@ -13,8 +13,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; - /** * 用户转赠钻石记录表 * diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserImpeachController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserImpeachController.java index d2479f3ea..153785444 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserImpeachController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserImpeachController.java @@ -1,11 +1,11 @@ package com.accompany.business.controller.user; import com.accompany.business.common.BaseController; -import com.accompany.core.exception.ServiceException; import com.accompany.business.service.user.UserImpeachService; import com.accompany.business.vo.AccountBlockVo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; +import com.accompany.core.exception.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserVisitRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserVisitRecordController.java index b62d5d807..1fd9f3800 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserVisitRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserVisitRecordController.java @@ -3,7 +3,6 @@ package com.accompany.business.controller.user; import com.accompany.business.common.BaseController; import com.accompany.business.service.user.UserVisitRecordService; import com.accompany.business.vo.user.VisitUserVo; - import com.accompany.common.status.BusiStatus; import com.accompany.core.vo.BaseResponseVO; import io.swagger.annotations.Api; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java index a28f80634..56b6a5760 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java @@ -5,8 +5,6 @@ import com.accompany.business.model.UserInviteCode; import com.accompany.business.model.dress.ChatBubble; import com.accompany.business.model.dress.InfoCard; import com.accompany.business.model.newUserStart.NewUserSayHelloChannel; -import com.accompany.business.model.vip.VipAuthItem; -import com.accompany.business.param.UserParam; import com.accompany.business.service.account.AccountBlockService; import com.accompany.business.service.audiocard.AudioCardService; import com.accompany.business.service.charge.FirstChargeRewardService; @@ -17,7 +15,6 @@ import com.accompany.business.service.newUserStart.NewUserSayHelloChannelService import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.*; import com.accompany.business.service.vip.VipAuthItemService; -import com.accompany.business.service.world.WorldService; import com.accompany.business.util.VipUtil; import com.accompany.business.vo.PrivacyPolicyVersionVo; import com.accompany.business.vo.SimpleUserVo; @@ -27,13 +24,10 @@ import com.accompany.business.vo.user.CancelUserCheckVo; import com.accompany.business.vo.user.MsgNotifyVo; import com.accompany.business.vo.user.PrivacyVo; import com.accompany.common.annotation.Authorization; -import com.accompany.common.annotation.H5Authorization; import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Room; import com.accompany.core.model.Users; @@ -42,18 +36,14 @@ import com.accompany.core.service.user.PhoneBlackService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.StringUtils; import com.accompany.core.vo.UserVo; -import com.accompany.core.vo.WorldInfo; import com.accompany.core.vo.audiocard.UserAudioCardVo; import com.accompany.core.vo.user.InfoCardVo; import com.accompany.core.vo.vip.UserVipInfoVO; -import com.accompany.world.entity.World; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; import com.google.common.util.concurrent.RateLimiter; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.SneakyThrows; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,13 +52,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.accompany.common.constant.ApplicationConstant.PublicParameters.PUB_UID; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersV2Controller.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersV2Controller.java index dba202d30..cebe5d5d2 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersV2Controller.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersV2Controller.java @@ -14,7 +14,6 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.BlankUtil; -import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.vo.UserVo; @@ -23,9 +22,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java index a4065984c..b066d210f 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java @@ -8,21 +8,17 @@ import com.accompany.core.util.MD5; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import lombok.SneakyThrows; -import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; /** * @author yangziwen diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/AnchorFansTeamTaskTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/AnchorFansTeamTaskTest.java index 61f8f16c0..177957a79 100644 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/AnchorFansTeamTaskTest.java +++ b/accompany-business/accompany-business-web/src/test/java/servicetest/AnchorFansTeamTaskTest.java @@ -7,7 +7,6 @@ import com.accompany.business.service.anchor.AnchorFansTeamService; import com.accompany.business.service.user.UsersService; import com.accompany.common.constant.Constant; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/BlindDateTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/BlindDateTest.java index dcd7cc4c2..431e7fc3f 100644 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/BlindDateTest.java +++ b/accompany-business/accompany-business-web/src/test/java/servicetest/BlindDateTest.java @@ -4,10 +4,10 @@ import com.accompany.business.dto.QueueDTO; import com.accompany.business.dto.QueueListResponseDTO; import com.accompany.business.dto.room.BlindSendHeadwearConfigDto; import com.accompany.business.model.room.BlindDateRound; -import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.business.service.room.*; import com.accompany.business.service.user.UserInRoomService; import com.accompany.common.constant.Constant; +import com.accompany.common.netease.ErBanNetEaseService; import com.accompany.common.netease.neteaseacc.result.RoomRet; import com.accompany.core.model.Room; import com.accompany.core.service.SysConfService; diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/MiniGameTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/MiniGameTest.java deleted file mode 100644 index 16378b7c1..000000000 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/MiniGameTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package servicetest; - -import com.accompany.business.model.miniGame.MiniGameRoom; -import com.accompany.business.mybatismapper.miniGame.MiniGameRoomMapper; -import com.accompany.business.mybatismapper.miniGame.MiniGameRoundMapper; -import com.accompany.business.service.home.HomeService; -import com.accompany.business.service.miniGame.MiniGameCallbackService; -import com.accompany.business.service.room.RoomService; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.redis.RedisKey; -import com.accompany.core.model.Account; -import com.accompany.core.model.Room; -import com.accompany.core.service.account.AccountService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.google.gson.Gson; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; -import java.util.Map; - -public class MiniGameTest extends CommonTest { - @Autowired - private MiniGameCallbackService miniGameCallbackService; - @Autowired - private RoomService roomService; - - @Autowired - private UsersBaseService usersBaseService; - - @Autowired - private AccountService accountService; - - @Autowired - private HomeService homeService; - - @Autowired - private MiniGameRoomMapper miniGameRoomMapper; - - @Autowired - private JedisService jedisService; - - @Autowired - private MiniGameRoundMapper miniGameRoundMapper; - - - protected Gson gson = new Gson(); - - - - @Test - public void miniGameDemoTest() { - /*Long uid = 1004340l; - - SudCode sudCode = miniGameService.getCode(String.valueOf(uid)); - - System.out.println("code = " + sudCode.getCode() + ", ExpireDate = " + sudCode.getExpireDate()); - - BaseResp baseResp = miniGameService.getSSToken(sudCode.getCode()); - System.out.println("name = " + baseResp.getRet_code().getName()); - System.out.println("ret_msg = " + baseResp.getRet_msg()); - System.out.println("data = " + gson.toJson(baseResp.getData()));*/ - System.out.println(111); - } - - - @Test - public void hotRoomTest() throws Exception { - Long uid = 1000429l; - Long erbanNo = 3636257l; - Account account = accountService.getAccountByErBanNo(erbanNo); - DeviceInfo deviceInfo = gson.fromJson(account.getDeviceInfo(), DeviceInfo.class); - - - homeService.hotRoom(uid, deviceInfo); - System.out.println("结束运行...."); - } - - @Test - public void writeMiniGameRoomToCacheTest() throws Exception { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(MiniGameRoom::getStatus, 1).orderByAsc(MiniGameRoom::getId); - List miniGameRoomList = miniGameRoomMapper.selectList(queryWrapper); - - Map miniGameListMap = jedisService.hgetAll(RedisKey.mini_game_room.getKey()); - /*jedisService.del(RedisKey.mini_game_room.getKey()); - miniGameListMap = jedisService.hgetAll(RedisKey.mini_game_room.getKey()); - miniGameRoomList.forEach(miniGameRoom -> { - jedisService.hset(RedisKey.mini_game_room.getKey(), String.valueOf(miniGameRoom.getRoomUid()), String.valueOf(miniGameRoom.getId())); - });*/ - System.out.println("运行结束..."); - - } - - @Test - public void getLatestStateTest() throws Exception { - Long roomUid = 1005265l; - - Byte state = miniGameRoundMapper.getLatestState(roomUid); - System.out.println("结束运行state = " + state); - } - - - - - - - - -} diff --git a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java index c8a341e57..b62c80571 100644 --- a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java +++ b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java @@ -5,7 +5,6 @@ import com.accompany.common.redis.RedisKey; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.mq.model.BaseMqMessage; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.core.RocketMQListener; diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/LinearlyPoolPrizeMessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/LinearlyPoolPrizeMessageConsumer.java index 09b8251b1..b54b66214 100644 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/LinearlyPoolPrizeMessageConsumer.java +++ b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/LinearlyPoolPrizeMessageConsumer.java @@ -12,7 +12,6 @@ import org.apache.rocketmq.spring.annotation.ConsumeMode; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; /** * 线性奖池中奖消息 diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/YiDunIMTextAntiMessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/YiDunIMTextAntiMessageConsumer.java index ec72d8634..2dd4ee79f 100644 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/YiDunIMTextAntiMessageConsumer.java +++ b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/YiDunIMTextAntiMessageConsumer.java @@ -4,7 +4,6 @@ import com.accompany.business.message.YidunIMAntiMessage; import com.accompany.business.service.netease.YidunAntiHandleService; import com.accompany.common.redis.RedisKey; import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.StringUtils; import com.accompany.mq.constant.MqConstant; import com.accompany.mq.listener.AbstractMessageListener; import com.alibaba.fastjson.JSON; diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java index 14a96949f..198734ad0 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java @@ -8,9 +8,13 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.CommonUtil; import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.*; +import com.accompany.core.model.Account; +import com.accompany.core.model.AccountLoginRecord; +import com.accompany.core.model.PrettyNumberRecord; +import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.PrettyNumberRecordMapper; import com.accompany.core.service.SysConfService; +import com.accompany.core.service.account.AccountBlockCheckService; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.account.LoginRecordService; import com.accompany.core.service.account.UserAppService; @@ -22,7 +26,6 @@ import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.oauth2.constant.LoginTypeEnum; import com.accompany.oauth2.exception.CustomOAuth2Exception; import com.accompany.oauth2.model.AccountDetails; -import com.accompany.core.service.account.AccountBlockCheckService; import com.accompany.oauth2.service.account.AccountManageService; import com.accompany.oauth2.util.RequestContextHolderUtils; import com.accompany.sms.service.SmsService; diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java index fb86d8638..9b0ae075d 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java @@ -25,12 +25,11 @@ import com.accompany.core.service.user.UserCancelRecordService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.MD5; import com.accompany.oauth2.constant.LoginTypeEnum; -import com.accompany.oauth2.dto.RepeatedDeviceIpRegisterLimitConfig; import com.accompany.oauth2.dto.DayIpMaxRegisterLimitConfig; +import com.accompany.oauth2.dto.RepeatedDeviceIpRegisterLimitConfig; import com.accompany.oauth2.event.UserRegisterSuccessEvent; import com.accompany.oauth2.exception.CustomOAuth2Exception; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/config/AuthorizationServerConfig.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/config/AuthorizationServerConfig.java index 885f6568e..0fa6e6608 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/config/AuthorizationServerConfig.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/config/AuthorizationServerConfig.java @@ -5,17 +5,14 @@ import com.accompany.oauth2.constant.GrantTypeEnum; import com.accompany.oauth2.exception.CustomOAuth2WebResponseExceptionTranslator; import com.accompany.oauth2.jwt.JwtTicketConverter; import com.accompany.oauth2.jwt.JwtTokenConverter; -import com.accompany.oauth2.service.account.SuperAdminGrantService; import com.accompany.oauth2.support.password.PasswordTokenGranter; import com.accompany.oauth2.support.verify.VerifyCodeTokenGranter; import com.accompany.oauth2.ticket.RedisTicketStore; import com.accompany.oauth2.ticket.TicketServices; import com.accompany.oauth2.ticket.TicketStore; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/H5LoginController.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/H5LoginController.java index 41f1688a2..061cee492 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/H5LoginController.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/H5LoginController.java @@ -1,7 +1,6 @@ package com.accompany.oauth2.controller; import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; import com.accompany.oauth2.common.BaseController; import com.accompany.oauth2.service.account.AccountH5LoginService; diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java index 9ba7ab464..846d9ad64 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/DynamicTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/DynamicTask.java index ee39fba47..388e5be5d 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/DynamicTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/DynamicTask.java @@ -2,12 +2,12 @@ package com.accompany.scheduler.task; import com.accompany.business.service.community.DynamicService; import com.accompany.business.service.community.DynamicStatService; +import com.accompany.common.redis.RedisKey; +import com.accompany.common.utils.DateTimeUtil; import com.accompany.community.constant.DynamicStatusEnum; import com.accompany.community.entity.Dynamic; import com.accompany.community.query.DynamicDataStatQuery; import com.accompany.scheduler.base.BaseTask; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GiftTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GiftTask.java index 752eeef8b..87c8bf887 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GiftTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/GiftTask.java @@ -11,7 +11,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.Map; -import java.util.Set; @Component @Slf4j diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java index d916ed42c..abc0a79eb 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java @@ -3,9 +3,6 @@ package com.accompany.scheduler.task; import com.accompany.business.model.FaceJson; import com.accompany.business.service.room.FaceJsonService; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.BlankUtil; -import com.accompany.core.model.Room; -import com.accompany.core.mybatismapper.RoomMapperExpand; import com.accompany.scheduler.base.BaseTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,8 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Random; import java.util.concurrent.TimeUnit; @Component diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/LinearlyPoolTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/LinearlyPoolTask.java index c6efc8a6e..2850475fe 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/LinearlyPoolTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/LinearlyPoolTask.java @@ -5,7 +5,6 @@ import com.accompany.common.utils.DateTimeUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import java.util.Date; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java index f47a1e153..8100b7e3c 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RefreshPersonTask.java @@ -12,7 +12,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; -import java.util.Random; import java.util.concurrent.ThreadPoolExecutor; /** diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/FindLoveDrawTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/FindLoveDrawTask.java index ae4322976..55ac4868a 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/FindLoveDrawTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/FindLoveDrawTask.java @@ -1,11 +1,9 @@ package com.accompany.scheduler.task.activity; import com.accompany.business.service.findlove.FindLoveMsgService; -import com.accompany.business.service.treasure.SeizeTreasureService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; //@Component @Slf4j diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/SeizeTreasureTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/SeizeTreasureTask.java index b044ad6a1..120141147 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/SeizeTreasureTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/activity/SeizeTreasureTask.java @@ -4,7 +4,6 @@ import com.accompany.business.service.treasure.SeizeTreasureService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; //@Component @Slf4j diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/dress/UserPersonalBackgroundTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/dress/UserPersonalBackgroundTask.java index c900f9a4d..91e6811c3 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/dress/UserPersonalBackgroundTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/dress/UserPersonalBackgroundTask.java @@ -1,6 +1,5 @@ package com.accompany.scheduler.task.dress; -import com.accompany.business.service.dress.UserInfoCardTaskService; import com.accompany.business.service.dress.UserPersonalBackgroundService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/flowteam/SaveLastMonthSettlementDataTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/flowteam/SaveLastMonthSettlementDataTask.java index 9e52f0c30..b88aa460e 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/flowteam/SaveLastMonthSettlementDataTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/flowteam/SaveLastMonthSettlementDataTask.java @@ -10,12 +10,11 @@ */ package com.accompany.scheduler.task.flowteam; -import com.xuanyin.flowteam.service.FlowTeamSettlementInfoService; import com.accompany.scheduler.base.BaseTask; +import com.xuanyin.flowteam.service.FlowTeamSettlementInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomTask.java index 10cca2a1e..eaf92bf82 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/room/RoomTask.java @@ -3,7 +3,6 @@ package com.accompany.scheduler.task.room; import com.accompany.business.service.rank.PermitRoomTaskService; import com.accompany.business.service.room.RoomBackgroundService; import com.accompany.business.service.room.RoomCleanService; -import com.accompany.common.redis.RedisKey; import com.accompany.scheduler.base.BaseTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java index 2c669c870..0311779eb 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/weekstar/WeekStarAwardTask.java @@ -8,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.Calendar; -import java.util.Date; import java.util.List; /**