From fb70723f500924423c0542190b696e46356b6b88 Mon Sep 17 00:00:00 2001 From: easonzhu Date: Fri, 21 Feb 2025 20:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - .../controller/AdvisorInfoController.java | 2 +- .../syzb/advisor/entity/AdvisorFollow.java | 2 +- .../com/syzb/advisor/entity/AdvisorInfo.java | 2 +- .../advisor/entity/AdvisorSortEntity.java | 2 +- .../syzb/advisor/entity/AdvisorTagRel.java | 2 +- .../advisor/mapper/AdvisorFollowMapper.java | 4 +- .../advisor/mapper/AdvisorInfoMapper.java | 4 +- .../advisor/mapper/AdvisorTagRelMapper.java | 2 +- .../advisor/service/AdvisorInfoService.java | 10 +- .../syzb/app/constants/AppOrderStatus.java | 20 - .../java/com/syzb/app/entity/AppOrder.java | 292 --------- .../syzb/app/service/OrderSyncService.java | 48 -- .../java/com/syzb/app/vo/LiveDetailVO.java | 189 ------ src/main/java/com/syzb/app/vo/LiveListVO.java | 44 -- .../business/constants/AppOrderStatus.java | 32 + .../com/syzb/business/entity/AppOrder.java | 563 ++++++++++++++++++ .../{app => business}/entity/AppRels.java | 4 +- .../com/syzb/business/entity/ModuleUser.java | 112 ++++ .../mapper/AppOrderMapper.java | 10 +- .../mapper/AppRelsMapper.java | 6 +- .../business/mapper/ModuleUserMapper.java | 16 + .../syzb/business/schedule/BusinessTask.java | 39 ++ .../business/service/BusinessApiService.java | 48 +- .../business/service/BusinessDataService.java | 218 +++++++ .../service/OrderQueryService.java | 147 ++--- .../business/vo/BusinessModuleUserExtVO.java | 46 ++ .../business/vo/BusinessModuleUserRspVO.java | 14 + .../business/vo/BusinessModuleUserVO.java | 65 ++ .../vo/order}/OrderStatCollect.java | 2 +- .../syzb/common/config/cache/CacheKey.java | 2 + .../com/syzb/common/constant/ProductType.java | 1 - .../common/controller/AdvertController.java | 2 +- .../controller/RecommendController.java | 2 +- .../controller/ScheduleLogController.java | 2 +- .../controller/SensitiveWordController.java | 4 +- .../syzb/common/controller/TagController.java | 2 +- .../java/com/syzb/common/entity/Advert.java | 2 +- .../com/syzb/common/entity/BlackStock.java | 2 +- .../java/com/syzb/common/entity/Comment.java | 2 +- .../com/syzb/common/entity/CommentBlack.java | 2 +- .../com/syzb/common/entity/OperationLog.java | 2 +- .../com/syzb/common/entity/Recommend.java | 2 +- .../com/syzb/common/entity/RiskLevel.java | 2 +- .../com/syzb/common/entity/SafetyConfig.java | 2 +- .../com/syzb/common/entity/ScheduleLog.java | 2 +- .../com/syzb/common/entity/SensitiveWord.java | 2 +- .../java/com/syzb/common/entity/ShortUrl.java | 2 +- src/main/java/com/syzb/common/entity/Tag.java | 2 +- .../syzb/common/entity/UserBehaviorLog.java | 2 +- .../com/syzb/common/filter/AuthFilter.java | 4 +- .../syzb/common/generator/CodeGenerator.java | 6 +- .../handler/GlobalExceptionHandler.java | 2 +- .../interceptor/WebSocketAuthHandler.java | 2 +- .../interceptor/WebSocketSessionHandler.java | 2 +- .../com/syzb/common/mapper/AdvertMapper.java | 2 +- .../common/mapper/CommentBlackMapper.java | 2 +- .../com/syzb/common/mapper/CommentMapper.java | 2 +- .../common/mapper/OperationLogMapper.java | 2 +- .../syzb/common/mapper/RecommendMapper.java | 2 +- .../syzb/common/mapper/RiskLevelMapper.java | 2 +- .../syzb/common/mapper/ScheduleLogMapper.java | 2 +- .../common/mapper/SensitiveWordMapper.java | 2 +- .../syzb/common/mapper/ShortUrlMapper.java | 2 +- .../com/syzb/common/mapper/TagMapper.java | 2 +- .../syzb/common/service/AdvertService.java | 8 +- .../syzb/common/service/AppUserService.java | 2 +- .../com/syzb/common/service/CacheService.java | 8 +- .../common/service/CommentBlackService.java | 6 +- .../syzb/common/service/CommentService.java | 10 +- .../common/service/MergeProductService.java | 4 +- .../syzb/common/service/RecommendService.java | 8 +- .../common/service/SensitiveWordService.java | 2 +- .../com/syzb/common/service/TagService.java | 4 +- .../com/syzb/common/service/UrlService.java | 4 +- .../com/syzb/common/state/StateMachine.java | 6 +- .../java/com/syzb/course/entity/Course.java | 2 +- .../com/syzb/course/entity/CourseContent.java | 2 +- .../com/syzb/course/entity/CoursePackage.java | 2 +- .../course/entity/CoursePackageContent.java | 2 +- .../java/com/syzb/course/entity/MainTab.java | 2 +- .../java/com/syzb/course/entity/Page.java | 2 +- .../java/com/syzb/course/entity/Serial.java | 2 +- .../com/syzb/course/entity/SerialContent.java | 2 +- .../com/syzb/course/entity/ShortVideo.java | 2 +- .../syzb/course/entity/ShortVideoCart.java | 2 +- .../course/entity/ShortVideoCartClick.java | 2 +- .../syzb/course/entity/ShortVideoFavor.java | 2 +- .../syzb/course/entity/ShortVideoSale.java | 2 +- .../syzb/course/entity/ShortVideoShare.java | 2 +- .../syzb/course/entity/ShortVideoWatch.java | 2 +- .../com/syzb/course/entity/WorkWeixin.java | 2 +- .../course/mapper/CourseContentMapper.java | 2 +- .../com/syzb/course/mapper/CourseMapper.java | 2 +- .../mapper/CoursePackageContentMapper.java | 2 +- .../course/mapper/CoursePackageMapper.java | 2 +- .../com/syzb/course/mapper/MainTabMapper.java | 2 +- .../com/syzb/course/mapper/PageMapper.java | 2 +- .../course/mapper/SerialContentMapper.java | 2 +- .../com/syzb/course/mapper/SerialMapper.java | 2 +- .../mapper/ShortVideoCartClickMapper.java | 2 +- .../course/mapper/ShortVideoCartMapper.java | 2 +- .../course/mapper/ShortVideoFavorMapper.java | 2 +- .../syzb/course/mapper/ShortVideoMapper.java | 2 +- .../course/mapper/ShortVideoSaleMapper.java | 2 +- .../course/mapper/ShortVideoShareMapper.java | 2 +- .../course/mapper/ShortVideoWatchMapper.java | 2 +- .../syzb/course/mapper/WorkWeixinMapper.java | 2 +- .../course/service/CourseCommonService.java | 4 +- .../course/service/CoursePackageService.java | 6 +- .../syzb/course/service/CoursePcService.java | 2 +- .../syzb/course/service/CourseService.java | 6 +- .../syzb/course/service/MainTabService.java | 8 +- .../com/syzb/course/service/PageService.java | 2 +- .../syzb/course/service/SerialService.java | 6 +- .../course/service/ShortVideoService.java | 10 +- .../course/service/WorkWeixinService.java | 2 +- .../com/syzb/group/entity/GroupCollect.java | 2 +- .../java/com/syzb/group/entity/GroupInfo.java | 2 +- .../com/syzb/group/entity/GroupMessage.java | 2 +- .../syzb/group/entity/GroupMessageRead.java | 2 +- .../com/syzb/group/entity/GroupUserFlow.java | 2 +- .../syzb/group/mapper/GroupCollectMapper.java | 2 +- .../syzb/group/mapper/GroupInfoMapper.java | 2 +- .../syzb/group/mapper/GroupMessageMapper.java | 2 +- .../group/mapper/GroupMessageReadMapper.java | 2 +- .../group/mapper/GroupUserFlowMapper.java | 2 +- .../syzb/group/service/GroupInfoService.java | 6 +- .../admin/AdminGroupMessageService.java | 6 +- .../service/common/GroupCacheService.java | 13 +- .../service/common/GroupCommonService.java | 4 +- .../service/common/GroupMessageService.java | 4 +- .../syzb/rbac/controller/AuthController.java | 2 +- .../syzb/rbac/controller/DeptController.java | 2 +- .../syzb/rbac/controller/MenuController.java | 2 +- .../rbac/controller/PermissionController.java | 2 +- .../syzb/rbac/controller/RoleController.java | 2 +- .../syzb/rbac/controller/UserController.java | 2 +- src/main/java/com/syzb/rbac/entity/Dept.java | 2 +- src/main/java/com/syzb/rbac/entity/Menu.java | 2 +- .../java/com/syzb/rbac/entity/Permission.java | 2 +- src/main/java/com/syzb/rbac/entity/Role.java | 2 +- .../java/com/syzb/rbac/entity/RolesMenus.java | 2 +- .../syzb/rbac/entity/RolesPermissions.java | 2 +- .../com/syzb/rbac/entity/UserBlackList.java | 2 +- .../java/com/syzb/rbac/entity/UserDept.java | 2 +- .../java/com/syzb/rbac/entity/UserLogin.java | 2 +- .../com/syzb/rbac/entity/UserRoleEntity.java | 2 +- .../java/com/syzb/rbac/entity/UsersRoles.java | 2 +- .../java/com/syzb/rbac/entity/WxUser.java | 2 +- .../java/com/syzb/rbac/mapper/DeptMapper.java | 2 +- .../java/com/syzb/rbac/mapper/MenuMapper.java | 2 +- .../syzb/rbac/mapper/PermissionMapper.java | 2 +- .../java/com/syzb/rbac/mapper/RoleMapper.java | 2 +- .../syzb/rbac/mapper/RolesMenusMapper.java | 2 +- .../rbac/mapper/RolesPermissionsMapper.java | 2 +- .../syzb/rbac/mapper/UserBlackListMapper.java | 2 +- .../com/syzb/rbac/mapper/UserDeptMapper.java | 2 +- .../com/syzb/rbac/mapper/UserLoginMapper.java | 2 +- .../syzb/rbac/mapper/UsersRolesMapper.java | 2 +- .../com/syzb/rbac/mapper/WxUserMapper.java | 2 +- .../com/syzb/rbac/service/AuthService.java | 8 +- .../com/syzb/rbac/service/DeptService.java | 4 +- .../syzb/rbac/service/PermissionService.java | 2 +- .../com/syzb/rbac/service/RoleService.java | 2 +- .../rbac/service/UserBlackListService.java | 4 +- .../com/syzb/rbac/service/UserService.java | 12 +- .../admin/AdminVideoStatisticController.java | 4 +- .../syzb/video/entity/CloudMediaEntity.java | 4 +- .../video/entity/VideoBehaviorNotify.java | 2 +- .../syzb/video/entity/VideoBrowseDetail.java | 2 +- .../java/com/syzb/video/entity/VideoCart.java | 2 +- .../syzb/video/entity/VideoColumnFollow.java | 2 +- .../video/entity/VideoListSortEntity.java | 2 +- .../java/com/syzb/video/entity/VideoLive.java | 2 +- .../syzb/video/entity/VideoLiveActivity.java | 2 +- .../syzb/video/entity/VideoLiveColumn.java | 2 +- .../video/entity/VideoLiveColumnVideo.java | 2 +- .../syzb/video/entity/VideoLiveCustomer.java | 2 +- .../video/entity/VideoLiveCustomerSale.java | 2 +- .../syzb/video/entity/VideoLiveLibrary.java | 2 +- .../syzb/video/entity/VideoLiveMessage.java | 2 +- .../com/syzb/video/entity/VideoLiveMix.java | 2 +- .../com/syzb/video/entity/VideoLivePush.java | 2 +- .../com/syzb/video/entity/VideoLiveRisk.java | 2 +- .../com/syzb/video/entity/VideoLiveTag.java | 2 +- .../com/syzb/video/entity/VideoLiveUser.java | 2 +- .../video/entity/VideoQuestionAnswer.java | 2 +- .../syzb/video/entity/VideoQuestionMain.java | 2 +- .../video/entity/VideoQuestionOption.java | 2 +- .../syzb/video/entity/VideoQuestionTitle.java | 2 +- .../video/entity/VideoUserTimeCollect.java | 2 +- .../video/entity/VideoUserWatchCollect.java | 2 +- .../mapper/VideoBehaviorNotifyMapper.java | 2 +- .../video/mapper/VideoBrowseDetailMapper.java | 2 +- .../syzb/video/mapper/VideoCartMapper.java | 2 +- .../video/mapper/VideoColumnFollowMapper.java | 2 +- .../video/mapper/VideoLiveActivityMapper.java | 2 +- .../video/mapper/VideoLiveColumnMapper.java | 2 +- .../mapper/VideoLiveColumnVideoMapper.java | 2 +- .../video/mapper/VideoLiveCustomerMapper.java | 2 +- .../mapper/VideoLiveCustomerSaleMapper.java | 2 +- .../video/mapper/VideoLiveLibraryMapper.java | 2 +- .../syzb/video/mapper/VideoLiveMapper.java | 18 +- .../video/mapper/VideoLiveMessageMapper.java | 2 +- .../syzb/video/mapper/VideoLiveMixMapper.java | 2 +- .../video/mapper/VideoLivePushMapper.java | 2 +- .../video/mapper/VideoLiveRiskMapper.java | 2 +- .../syzb/video/mapper/VideoLiveTagMapper.java | 2 +- .../video/mapper/VideoLiveUserMapper.java | 2 +- .../mapper/VideoQuestionAnswerMapper.java | 2 +- .../video/mapper/VideoQuestionMainMapper.java | 2 +- .../mapper/VideoQuestionOptionMapper.java | 2 +- .../mapper/VideoQuestionTitleMapper.java | 2 +- .../mapper/VideoUserTimeCollectMapper.java | 2 +- .../mapper/VideoUserWatchCollectMapper.java | 2 +- .../com/syzb/video/schedule/VideoTimer.java | 6 +- .../admin/AdminVideoActivityService.java | 8 +- .../service/admin/AdminVideoCartService.java | 6 +- .../admin/AdminVideoColumnService.java | 2 +- .../admin/AdminVideoCustomerService.java | 22 +- .../service/admin/AdminVideoInfoService.java | 8 +- .../admin/AdminVideoInteractionService.java | 10 +- .../admin/AdminVideoMessageService.java | 6 +- .../service/admin/AdminVideoMixService.java | 2 +- .../service/admin/AdminVideoPushService.java | 6 +- .../admin/AdminVideoQuestionService.java | 4 +- .../admin/AdminVideoStatisticService.java | 32 +- .../service/app/AppVideoActivityService.java | 4 +- .../service/app/AppVideoCartService.java | 2 +- .../service/app/AppVideoColumnService.java | 2 +- .../service/app/AppVideoCustomerService.java | 4 +- .../service/app/AppVideoInfoService.java | 12 +- .../app/AppVideoInteractionService.java | 6 +- .../service/common/VideoCacheService.java | 16 +- .../service/common/VideoCloudService.java | 16 +- .../service/common/VideoCommonService.java | 2 +- .../service/common/VideoMessageService.java | 8 +- ...eProductSaleVO.java => ProductSaleVO.java} | 6 +- .../video/vo/statistic/VideoScreenVO.java | 14 +- src/main/resources/conf/advisorServer.yaml | 12 +- 241 files changed, 1605 insertions(+), 1067 deletions(-) delete mode 100644 src/main/java/com/syzb/app/constants/AppOrderStatus.java delete mode 100644 src/main/java/com/syzb/app/entity/AppOrder.java delete mode 100644 src/main/java/com/syzb/app/service/OrderSyncService.java delete mode 100644 src/main/java/com/syzb/app/vo/LiveDetailVO.java delete mode 100644 src/main/java/com/syzb/app/vo/LiveListVO.java create mode 100644 src/main/java/com/syzb/business/constants/AppOrderStatus.java create mode 100644 src/main/java/com/syzb/business/entity/AppOrder.java rename src/main/java/com/syzb/{app => business}/entity/AppRels.java (96%) create mode 100644 src/main/java/com/syzb/business/entity/ModuleUser.java rename src/main/java/com/syzb/{app => business}/mapper/AppOrderMapper.java (50%) rename src/main/java/com/syzb/{app => business}/mapper/AppRelsMapper.java (68%) create mode 100644 src/main/java/com/syzb/business/mapper/ModuleUserMapper.java create mode 100644 src/main/java/com/syzb/business/schedule/BusinessTask.java create mode 100644 src/main/java/com/syzb/business/service/BusinessDataService.java rename src/main/java/com/syzb/{app => business}/service/OrderQueryService.java (64%) create mode 100644 src/main/java/com/syzb/business/vo/BusinessModuleUserExtVO.java create mode 100644 src/main/java/com/syzb/business/vo/BusinessModuleUserRspVO.java create mode 100644 src/main/java/com/syzb/business/vo/BusinessModuleUserVO.java rename src/main/java/com/syzb/{app/vo => business/vo/order}/OrderStatCollect.java (98%) rename src/main/java/com/syzb/video/vo/statistic/{VideoLiveProductSaleVO.java => ProductSaleVO.java} (80%) diff --git a/pom.xml b/pom.xml index 733dcd5..81d83a5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ org.freemarker freemarker 2.3.31 - provided com.baomidou diff --git a/src/main/java/com/syzb/advisor/controller/AdvisorInfoController.java b/src/main/java/com/syzb/advisor/controller/AdvisorInfoController.java index 032423e..aae233c 100644 --- a/src/main/java/com/syzb/advisor/controller/AdvisorInfoController.java +++ b/src/main/java/com/syzb/advisor/controller/AdvisorInfoController.java @@ -34,7 +34,7 @@ import java.util.Map; * 投顾信息 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ @Api(tags = "投顾信息") diff --git a/src/main/java/com/syzb/advisor/entity/AdvisorFollow.java b/src/main/java/com/syzb/advisor/entity/AdvisorFollow.java index 525e55c..3d0ef28 100644 --- a/src/main/java/com/syzb/advisor/entity/AdvisorFollow.java +++ b/src/main/java/com/syzb/advisor/entity/AdvisorFollow.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 用户关注投顾信息 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public class AdvisorFollow implements Serializable { diff --git a/src/main/java/com/syzb/advisor/entity/AdvisorInfo.java b/src/main/java/com/syzb/advisor/entity/AdvisorInfo.java index 61da85b..e2948be 100644 --- a/src/main/java/com/syzb/advisor/entity/AdvisorInfo.java +++ b/src/main/java/com/syzb/advisor/entity/AdvisorInfo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 投顾信息 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public class AdvisorInfo implements Serializable { diff --git a/src/main/java/com/syzb/advisor/entity/AdvisorSortEntity.java b/src/main/java/com/syzb/advisor/entity/AdvisorSortEntity.java index 8491951..27a3123 100644 --- a/src/main/java/com/syzb/advisor/entity/AdvisorSortEntity.java +++ b/src/main/java/com/syzb/advisor/entity/AdvisorSortEntity.java @@ -10,7 +10,7 @@ import java.util.Objects; * 投顾基本信息 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public class AdvisorSortEntity implements Serializable, Comparable { diff --git a/src/main/java/com/syzb/advisor/entity/AdvisorTagRel.java b/src/main/java/com/syzb/advisor/entity/AdvisorTagRel.java index 6c9613c..c90160d 100644 --- a/src/main/java/com/syzb/advisor/entity/AdvisorTagRel.java +++ b/src/main/java/com/syzb/advisor/entity/AdvisorTagRel.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 投顾标签关系表 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public class AdvisorTagRel implements Serializable { diff --git a/src/main/java/com/syzb/advisor/mapper/AdvisorFollowMapper.java b/src/main/java/com/syzb/advisor/mapper/AdvisorFollowMapper.java index 16e1d40..a3c5353 100644 --- a/src/main/java/com/syzb/advisor/mapper/AdvisorFollowMapper.java +++ b/src/main/java/com/syzb/advisor/mapper/AdvisorFollowMapper.java @@ -1,14 +1,14 @@ package com.syzb.advisor.mapper; -import com.syzb.advisor.entity.AdvisorFollow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syzb.advisor.entity.AdvisorFollow; /** *

* 用户关注投顾信息 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public interface AdvisorFollowMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/advisor/mapper/AdvisorInfoMapper.java b/src/main/java/com/syzb/advisor/mapper/AdvisorInfoMapper.java index 2fed496..e23f07b 100644 --- a/src/main/java/com/syzb/advisor/mapper/AdvisorInfoMapper.java +++ b/src/main/java/com/syzb/advisor/mapper/AdvisorInfoMapper.java @@ -1,8 +1,8 @@ package com.syzb.advisor.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syzb.advisor.entity.AdvisorInfo; import com.syzb.advisor.entity.AdvisorSortEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,7 +13,7 @@ import java.util.List; * 投顾信息 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public interface AdvisorInfoMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/advisor/mapper/AdvisorTagRelMapper.java b/src/main/java/com/syzb/advisor/mapper/AdvisorTagRelMapper.java index f4eb83d..cf21745 100644 --- a/src/main/java/com/syzb/advisor/mapper/AdvisorTagRelMapper.java +++ b/src/main/java/com/syzb/advisor/mapper/AdvisorTagRelMapper.java @@ -13,7 +13,7 @@ import java.util.List; * 投顾标签关系表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-27 */ public interface AdvisorTagRelMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/advisor/service/AdvisorInfoService.java b/src/main/java/com/syzb/advisor/service/AdvisorInfoService.java index 511b9b7..fbab81b 100644 --- a/src/main/java/com/syzb/advisor/service/AdvisorInfoService.java +++ b/src/main/java/com/syzb/advisor/service/AdvisorInfoService.java @@ -2,6 +2,11 @@ package com.syzb.advisor.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.ImmutableSet; +import com.hazelcast.core.HazelcastInstance; import com.syzb.advisor.constant.AdvisorInfoStatus; import com.syzb.advisor.constant.FollowChannel; import com.syzb.advisor.constant.FollowOption; @@ -13,9 +18,6 @@ import com.syzb.advisor.query.*; import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.advisor.vo.AdvisorInfoAdminVO; import com.syzb.advisor.vo.AdvisorInfoAppVO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.syzb.common.constant.AdvertPosition; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -32,8 +34,6 @@ import com.syzb.common.state.StateMachine; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.CountVO; import com.syzb.common.vo.FrontUserVO; -import com.google.common.collect.ImmutableSet; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.constant.DeptType; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; diff --git a/src/main/java/com/syzb/app/constants/AppOrderStatus.java b/src/main/java/com/syzb/app/constants/AppOrderStatus.java deleted file mode 100644 index c747276..0000000 --- a/src/main/java/com/syzb/app/constants/AppOrderStatus.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.syzb.app.constants; - -// 订单状态 新订单180、已开通220、已停用/已退款90、已过期80、已取消70，关闭权限但未退款230 -public enum AppOrderStatus { - NEW(180, "新订单"), - OPENED(220, "已开通"), - REFUNDED(90, "已停用/已退款"), - EXPIRED(80, "已过期"), - CANCELED(70, "已取消"), - CLOSED_UN_REFUNDED(230, "关闭权限但未退款"); - - public final Integer value; - public final String name; - - AppOrderStatus(Integer value, String name) { - this.value = value; - this.name = name; - } - -} diff --git a/src/main/java/com/syzb/app/entity/AppOrder.java b/src/main/java/com/syzb/app/entity/AppOrder.java deleted file mode 100644 index 4f4fe92..0000000 --- a/src/main/java/com/syzb/app/entity/AppOrder.java +++ /dev/null @@ -1,292 +0,0 @@ -package com.syzb.app.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - *

- * C端订单 - *

- * - * @author easonzhu - * @since 2024-11-07 - */ -public class AppOrder implements Serializable { - - - /** - * 订单号 - */ - @TableId("order_id") - private String orderId; - - /** - * 产品ID - */ - @TableField("product_id") - private String productId; - - /** - * 产品名称 - */ - @TableField("product_name") - private String productName; - - /** - * 用户名\UPID - */ - @TableField("user_name") - private String userName; - - /** - * 订单状态 新订单180、已开通220、已停用/已退款90、已过期80、已取消70，关闭权限但未退款230 - */ - private Integer status; - - /** - * 支付状态 1:已支付 2:未支付 - */ - @TableField("pay_status") - private Integer payStatus; - - /** - * 订单金额 - */ - @TableField("total_price") - private BigDecimal totalPrice; - - /** - * 支付金额 - */ - @TableField("pay_total") - private BigDecimal payTotal; - - /** - * 下单渠道 - */ - private Integer currch; - - /** - * 扩展信息 - */ - @TableField("ext_info") - private String extInfo; - - /** - * 传参 - */ - private String bvideo; - - /** - * 视频ID - */ - @TableField("video_id") - private Integer videoId; - - /** - * 视频类型 3:直播 - */ - @TableField("product_type") - private Integer productType; - - /** - * 营销人员 - */ - @TableField("sale_user_id") - private Integer saleUserId; - - /** - * 下单时间 - */ - @TableField("order_time") - private LocalDateTime orderTime; - - /** - * 支付时间 - */ - @TableField("pay_time") - private LocalDateTime payTime; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public String getProductId() { - return productId; - } - - public void setProductId(String productId) { - this.productId = productId; - } - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { - this.productName = productName; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getPayStatus() { - return payStatus; - } - - public void setPayStatus(Integer payStatus) { - this.payStatus = payStatus; - } - - public BigDecimal getTotalPrice() { - return totalPrice; - } - - public void setTotalPrice(BigDecimal totalPrice) { - this.totalPrice = totalPrice; - } - - public BigDecimal getPayTotal() { - return payTotal; - } - - public void setPayTotal(BigDecimal payTotal) { - this.payTotal = payTotal; - } - - public Integer getCurrch() { - return currch; - } - - public void setCurrch(Integer currch) { - this.currch = currch; - } - - public String getExtInfo() { - return extInfo; - } - - public void setExtInfo(String extInfo) { - this.extInfo = extInfo; - } - - public String getBvideo() { - return bvideo; - } - - public void setBvideo(String bvideo) { - this.bvideo = bvideo; - } - - public Integer getVideoId() { - return videoId; - } - - public void setVideoId(Integer videoId) { - this.videoId = videoId; - } - - public Integer getProductType() { - return productType; - } - - public void setProductType(Integer productType) { - this.productType = productType; - } - - public Integer getSaleUserId() { - return saleUserId; - } - - public void setSaleUserId(Integer saleUserId) { - this.saleUserId = saleUserId; - } - - public LocalDateTime getOrderTime() { - return orderTime; - } - - public void setOrderTime(LocalDateTime orderTime) { - this.orderTime = orderTime; - } - - public LocalDateTime getPayTime() { - return payTime; - } - - public void setPayTime(LocalDateTime payTime) { - this.payTime = payTime; - } - - public LocalDateTime getCreateTime() { - return createTime; - } - - public void setCreateTime(LocalDateTime createTime) { - this.createTime = createTime; - } - - public LocalDateTime getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(LocalDateTime updateTime) { - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "AppOrder{" + - "orderId=" + orderId + - ", productId=" + productId + - ", productName=" + productName + - ", userName=" + userName + - ", status=" + status + - ", totalPrice=" + totalPrice + - ", payTotal=" + payTotal + - ", currch=" + currch + - ", extInfo=" + extInfo + - ", bvideo=" + bvideo + - ", videoId=" + videoId + - ", productType=" + productType + - ", saleUserId=" + saleUserId + - ", orderTime=" + orderTime + - ", payTime=" + payTime + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - "}"; - } -} diff --git a/src/main/java/com/syzb/app/service/OrderSyncService.java b/src/main/java/com/syzb/app/service/OrderSyncService.java deleted file mode 100644 index de1f2d7..0000000 --- a/src/main/java/com/syzb/app/service/OrderSyncService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.syzb.app.service; - -import com.syzb.app.entity.AppOrder; -import com.syzb.app.mapper.AppOrderMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Objects; - -@Service -public class OrderSyncService { - - @Resource - private AppOrderMapper appOrderMapper; - - @Transactional(rollbackFor = Exception.class) - public void syncAppOrder(LocalDateTime startTime, LocalDateTime endTime) { - // TODO - } - - private boolean isEqual(AppOrder a, AppOrder b) { - return Objects.equals(a.getOrderId(), b.getOrderId()) - && Objects.equals(a.getProductId(), b.getProductId()) - && Objects.equals(a.getProductName(), b.getProductName()) - && Objects.equals(a.getUserName(), b.getUserName()) - && Objects.equals(a.getStatus(), b.getStatus()) - && Objects.equals(a.getPayStatus(), b.getPayStatus()) - && isEqual(a.getTotalPrice(), b.getTotalPrice()) - && isEqual(a.getPayTotal(), b.getPayTotal()) - && Objects.equals(a.getCurrch(), b.getCurrch()) - && Objects.equals(a.getExtInfo(), b.getExtInfo()) - && Objects.equals(a.getBvideo(), b.getBvideo()) - && Objects.equals(a.getVideoId(), b.getVideoId()) - && Objects.equals(a.getProductType(), b.getProductType()) - && Objects.equals(a.getSaleUserId(), b.getSaleUserId()) - && Objects.equals(a.getOrderTime(), b.getOrderTime()) - && Objects.equals(a.getPayTime(), b.getPayTime()); - } - - // BigDecimal忽略精度比较 - private boolean isEqual(BigDecimal a, BigDecimal b) { - return a == null ? b == null : a.compareTo(b) == 0; - } - -} diff --git a/src/main/java/com/syzb/app/vo/LiveDetailVO.java b/src/main/java/com/syzb/app/vo/LiveDetailVO.java deleted file mode 100644 index e5c0808..0000000 --- a/src/main/java/com/syzb/app/vo/LiveDetailVO.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.syzb.app.vo; - -import cn.hutool.core.date.DatePattern; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.video.entity.VideoLive; - -import java.io.Serializable; - -public class LiveDetailVO implements Serializable { - - private Integer id; - private String title; - private String listCoverUrl; - private String coverUrl; - private Integer advisorId; - private String advisorName; - private String advisorAvatar; - private String liveUrl; - private Integer liveStatus; - private Integer status; - private String startTime; - private String endTime; - private Integer readCount; - private Integer messageCount; - private Integer favorCount; - private Integer isRecommend; - private Integer isDisplay; - - public LiveDetailVO() { - } - - public LiveDetailVO(VideoLive live, AdvisorBasic advisor, String liveUrl, Integer readCount, Integer messageCount, Integer favorCount) { - this.id = live.getId(); - this.title = live.getTitle(); - this.listCoverUrl = live.getListCoverUrl(); - this.advisorId = live.getAdvisorId(); - if (advisor != null) { - this.advisorName = advisor.getShowName(); - this.advisorAvatar = advisor.getAvatar(); - } - this.liveUrl = liveUrl; - this.coverUrl = live.getImgUrl(); - this.liveStatus = live.getLiveStatus(); - this.status = live.getStatus(); - this.startTime = live.getStartTime().format(DatePattern.NORM_DATETIME_FORMATTER); - this.endTime = live.getEndTime().format(DatePattern.NORM_DATETIME_FORMATTER); - this.readCount = readCount; - this.messageCount = messageCount; - this.favorCount = favorCount; - this.isRecommend = live.getIsRecommend(); - this.isDisplay = live.getIsDisplay(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getListCoverUrl() { - return listCoverUrl; - } - - public void setListCoverUrl(String listCoverUrl) { - this.listCoverUrl = listCoverUrl; - } - - public String getCoverUrl() { - return coverUrl; - } - - public void setCoverUrl(String coverUrl) { - this.coverUrl = coverUrl; - } - - public Integer getAdvisorId() { - return advisorId; - } - - public void setAdvisorId(Integer advisorId) { - this.advisorId = advisorId; - } - - public String getAdvisorName() { - return advisorName; - } - - public void setAdvisorName(String advisorName) { - this.advisorName = advisorName; - } - - public String getAdvisorAvatar() { - return advisorAvatar; - } - - public void setAdvisorAvatar(String advisorAvatar) { - this.advisorAvatar = advisorAvatar; - } - - public String getLiveUrl() { - return liveUrl; - } - - public void setLiveUrl(String liveUrl) { - this.liveUrl = liveUrl; - } - - public Integer getLiveStatus() { - return liveStatus; - } - - public void setLiveStatus(Integer liveStatus) { - this.liveStatus = liveStatus; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public Integer getReadCount() { - return readCount; - } - - public void setReadCount(Integer readCount) { - this.readCount = readCount; - } - - public Integer getMessageCount() { - return messageCount; - } - - public void setMessageCount(Integer messageCount) { - this.messageCount = messageCount; - } - - public Integer getFavorCount() { - return favorCount; - } - - public void setFavorCount(Integer favorCount) { - this.favorCount = favorCount; - } - - public Integer getIsRecommend() { - return isRecommend; - } - - public void setIsRecommend(Integer isRecommend) { - this.isRecommend = isRecommend; - } - - public Integer getIsDisplay() { - return isDisplay; - } - - public void setIsDisplay(Integer isDisplay) { - this.isDisplay = isDisplay; - } -} diff --git a/src/main/java/com/syzb/app/vo/LiveListVO.java b/src/main/java/com/syzb/app/vo/LiveListVO.java deleted file mode 100644 index fc351c7..0000000 --- a/src/main/java/com/syzb/app/vo/LiveListVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.syzb.app.vo; - -import java.io.Serializable; -import java.util.List; - -public class LiveListVO implements Serializable { - - public List result; - public Integer total; - public String listUrl; - - public LiveListVO() { - } - - public LiveListVO(List result, Integer total, String listUrl) { - this.result = result; - this.total = total; - this.listUrl = listUrl; - } - - public List getResult() { - return result; - } - - public void setResult(List result) { - this.result = result; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public String getListUrl() { - return listUrl; - } - - public void setListUrl(String listUrl) { - this.listUrl = listUrl; - } -} diff --git a/src/main/java/com/syzb/business/constants/AppOrderStatus.java b/src/main/java/com/syzb/business/constants/AppOrderStatus.java new file mode 100644 index 0000000..da8882d --- /dev/null +++ b/src/main/java/com/syzb/business/constants/AppOrderStatus.java @@ -0,0 +1,32 @@ +package com.syzb.business.constants; + +// 订单状态 +// 180:新订单 +// 200:已支付 +// 220:已开通 +// 205:已升级 +// 90:已退款 +// 80:已过期 +// 60:已关闭 +// 50:已暂停 +public enum AppOrderStatus { + + NEW(180, "新订单"), + PAID(200, "已支付"), + OPENED(220, "已开通"), + UPGRADED(205, "已升级"), + REFUNDED(90, "已退款"), + EXPIRED(80, "已过期"), + CLOSED(60, "已关闭"), + PAUSED(50, "已暂停"), + ; + + public final Integer value; + public final String name; + + AppOrderStatus(Integer value, String name) { + this.value = value; + this.name = name; + } + +} diff --git a/src/main/java/com/syzb/business/entity/AppOrder.java b/src/main/java/com/syzb/business/entity/AppOrder.java new file mode 100644 index 0000000..855e32c --- /dev/null +++ b/src/main/java/com/syzb/business/entity/AppOrder.java @@ -0,0 +1,563 @@ +package com.syzb.business.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 订单表 + *

+ * + * @author helloSyzb + * @since 2025-02-21 + */ +public class AppOrder implements Serializable { + + + /** + * 订单号 + */ + @TableId(value = "order_id", type = IdType.AUTO) + private Integer orderId; + + /** + * 产品名称 + */ + @TableField("product_name") + private String productName; + + /** + * 订购天数 + */ + @TableField("order_day") + private Integer orderDay; + + /** + * 当前价格 + */ + @TableField("current_price") + private BigDecimal currentPrice; + + /** + * 订单状态 180:新订单 200:已支付 220:已开通 205:已升级 90:已退款 80:已过期 60:已关闭 50:已暂停 + */ + @TableField("order_state") + private Integer orderState; + + /** + * 支付状态 1:已支付 2:未支付 + */ + @TableField("pay_status") + private Integer payStatus; + + /** + * 订单原价 + */ + @TableField("original_price") + private BigDecimal originalPrice; + + /** + * 开通状态 0:未开通 1:已开通 + */ + @TableField("is_open") + private Integer isOpen; + + /** + * 到账金额(多笔付款合计) + */ + @TableField("received_amount") + private BigDecimal receivedAmount; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 用户编号 + */ + @TableField("user_id") + private String userId; + + /** + * 手机号(脱敏) + */ + private String mobile; + + /** + * 手机号(无规则的唯一键) + */ + @TableField("um_id") + private String umId; + + /** + * 订单批次号 + */ + @TableField("batch_id") + private String batchId; + + /** + * 产品的唯一ID + */ + private String sku; + + /** + * 渠道号 + */ + private Integer channel; + + /** + * 部门ID + */ + @TableField("department_id") + private Integer departmentId; + + /** + * 开通时间 + */ + @TableField("open_time") + private LocalDateTime openTime; + + /** + * 暂停时间 + */ + @TableField("suspend_time") + private LocalDateTime suspendTime; + + /** + * 暂停原因 + */ + @TableField("suspend_remark") + private String suspendRemark; + + /** + * 剩余天数 + */ + @TableField("remaining_day") + private Integer remainingDay; + + /** + * 到账时间 + */ + @TableField("received_amount_time") + private LocalDateTime receivedAmountTime; + + /** + * 终止类型 1:升级 2:退款 3:作废 4:过期 + */ + @TableField("stop_type") + private Integer stopType; + + /** + * 终止时间 + */ + @TableField("stop_time") + private LocalDateTime stopTime; + + /** + * 下单时间 + */ + @TableField("order_time") + private LocalDateTime orderTime; + + /** + * 附加信息 + */ + @TableField("ext_info") + private String extInfo; + + /** + * 订单备注：可以填写客户昵称、备注作为区分 + */ + private String remark; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + /** + * 活动名称 + */ + @TableField("activity_name") + private String activityName; + + /** + * 是否有合同 + */ + @TableField("has_pdf") + private Boolean hasPdf; + + /** + * 是否可以签约 + */ + @TableField("can_sign") + private Boolean canSign; + + /** + * 产品ID(ext_info解析) + */ + @TableField("product_id") + private Integer productId; + + /** + * 产品类型(ext_info解析) + */ + @TableField("product_type") + private Integer productType; + + /** + * 营销人员ID(ext_info解析) + */ + @TableField("sale_user_id") + private Integer saleUserId; + + /** + * 插入数据时间 + */ + @TableField("insert_time") + private LocalDateTime insertTime; + + /** + * 数据更新时间 + */ + @TableField("modify_time") + private LocalDateTime modifyTime; + + public Integer getOrderId() { + return orderId; + } + + public void setOrderId(Integer orderId) { + this.orderId = orderId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public Integer getOrderDay() { + return orderDay; + } + + public void setOrderDay(Integer orderDay) { + this.orderDay = orderDay; + } + + public BigDecimal getCurrentPrice() { + return currentPrice; + } + + public void setCurrentPrice(BigDecimal currentPrice) { + this.currentPrice = currentPrice; + } + + public Integer getOrderState() { + return orderState; + } + + public void setOrderState(Integer orderState) { + this.orderState = orderState; + } + + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + + public BigDecimal getOriginalPrice() { + return originalPrice; + } + + public void setOriginalPrice(BigDecimal originalPrice) { + this.originalPrice = originalPrice; + } + + public Integer getIsOpen() { + return isOpen; + } + + public void setIsOpen(Integer isOpen) { + this.isOpen = isOpen; + } + + public BigDecimal getReceivedAmount() { + return receivedAmount; + } + + public void setReceivedAmount(BigDecimal receivedAmount) { + this.receivedAmount = receivedAmount; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getUmId() { + return umId; + } + + public void setUmId(String umId) { + this.umId = umId; + } + + public String getBatchId() { + return batchId; + } + + public void setBatchId(String batchId) { + this.batchId = batchId; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public Integer getChannel() { + return channel; + } + + public void setChannel(Integer channel) { + this.channel = channel; + } + + public Integer getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(Integer departmentId) { + this.departmentId = departmentId; + } + + public LocalDateTime getOpenTime() { + return openTime; + } + + public void setOpenTime(LocalDateTime openTime) { + this.openTime = openTime; + } + + public LocalDateTime getSuspendTime() { + return suspendTime; + } + + public void setSuspendTime(LocalDateTime suspendTime) { + this.suspendTime = suspendTime; + } + + public String getSuspendRemark() { + return suspendRemark; + } + + public void setSuspendRemark(String suspendRemark) { + this.suspendRemark = suspendRemark; + } + + public Integer getRemainingDay() { + return remainingDay; + } + + public void setRemainingDay(Integer remainingDay) { + this.remainingDay = remainingDay; + } + + public LocalDateTime getReceivedAmountTime() { + return receivedAmountTime; + } + + public void setReceivedAmountTime(LocalDateTime receivedAmountTime) { + this.receivedAmountTime = receivedAmountTime; + } + + public Integer getStopType() { + return stopType; + } + + public void setStopType(Integer stopType) { + this.stopType = stopType; + } + + public LocalDateTime getStopTime() { + return stopTime; + } + + public void setStopTime(LocalDateTime stopTime) { + this.stopTime = stopTime; + } + + public LocalDateTime getOrderTime() { + return orderTime; + } + + public void setOrderTime(LocalDateTime orderTime) { + this.orderTime = orderTime; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public LocalDateTime getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; + } + + public String getActivityName() { + return activityName; + } + + public void setActivityName(String activityName) { + this.activityName = activityName; + } + + public Boolean getHasPdf() { + return hasPdf; + } + + public void setHasPdf(Boolean hasPdf) { + this.hasPdf = hasPdf; + } + + public Boolean getCanSign() { + return canSign; + } + + public void setCanSign(Boolean canSign) { + this.canSign = canSign; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + + public Integer getSaleUserId() { + return saleUserId; + } + + public void setSaleUserId(Integer saleUserId) { + this.saleUserId = saleUserId; + } + + public LocalDateTime getInsertTime() { + return insertTime; + } + + public void setInsertTime(LocalDateTime insertTime) { + this.insertTime = insertTime; + } + + public LocalDateTime getModifyTime() { + return modifyTime; + } + + public void setModifyTime(LocalDateTime modifyTime) { + this.modifyTime = modifyTime; + } + + @Override + public String toString() { + return "AppOrder{" + + "orderId=" + orderId + + ", productName='" + productName + '\'' + + ", orderDay=" + orderDay + + ", currentPrice=" + currentPrice + + ", orderState=" + orderState + + ", payStatus=" + payStatus + + ", originalPrice=" + originalPrice + + ", isOpen=" + isOpen + + ", receivedAmount=" + receivedAmount + + ", createTime=" + createTime + + ", userId=" + userId + + ", mobile='" + mobile + '\'' + + ", umId='" + umId + '\'' + + ", batchId='" + batchId + '\'' + + ", sku='" + sku + '\'' + + ", channel=" + channel + + ", departmentId=" + departmentId + + ", openTime=" + openTime + + ", suspendTime=" + suspendTime + + ", suspendRemark='" + suspendRemark + '\'' + + ", remainingDay=" + remainingDay + + ", receivedAmountTime=" + receivedAmountTime + + ", stopType=" + stopType + + ", stopTime=" + stopTime + + ", orderTime=" + orderTime + + ", extInfo='" + extInfo + '\'' + + ", remark='" + remark + '\'' + + ", updateTime=" + updateTime + + ", activityName='" + activityName + '\'' + + ", hasPdf=" + hasPdf + + ", canSign=" + canSign + + ", productId=" + productId + + ", productType=" + productType + + ", saleUserId=" + saleUserId + + ", insertTime=" + insertTime + + ", modifyTime=" + modifyTime + + '}'; + } +} diff --git a/src/main/java/com/syzb/app/entity/AppRels.java b/src/main/java/com/syzb/business/entity/AppRels.java similarity index 96% rename from src/main/java/com/syzb/app/entity/AppRels.java rename to src/main/java/com/syzb/business/entity/AppRels.java index ce4f2be..53e18f7 100644 --- a/src/main/java/com/syzb/app/entity/AppRels.java +++ b/src/main/java/com/syzb/business/entity/AppRels.java @@ -1,4 +1,4 @@ -package com.syzb.app.entity; +package com.syzb.business.entity; import com.baomidou.mybatisplus.annotation.TableField; @@ -9,7 +9,7 @@ import java.io.Serializable; * B端C端关系表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-29 */ public class AppRels implements Serializable { diff --git a/src/main/java/com/syzb/business/entity/ModuleUser.java b/src/main/java/com/syzb/business/entity/ModuleUser.java new file mode 100644 index 0000000..f3f6d22 --- /dev/null +++ b/src/main/java/com/syzb/business/entity/ModuleUser.java @@ -0,0 +1,112 @@ +package com.syzb.business.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.io.Serializable; +import java.time.LocalDateTime; + +public class ModuleUser implements Serializable { + + @TableId("id") + private Integer id; + + @TableField("user_id") + private Integer userId; + + @TableField("module_id") + private Integer moduleId; + + @TableField("end_time") + private LocalDateTime endTime; + + @TableField("create_time") + private LocalDateTime createTime; + + @TableField("update_time") + private LocalDateTime updateTime; + + @TableField("insert_time") + private LocalDateTime insertTime; + + @TableField("modify_time") + private LocalDateTime modifyTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getModuleId() { + return moduleId; + } + + public void setModuleId(Integer moduleId) { + this.moduleId = moduleId; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public LocalDateTime getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; + } + + public LocalDateTime getInsertTime() { + return insertTime; + } + + public void setInsertTime(LocalDateTime insertTime) { + this.insertTime = insertTime; + } + + public LocalDateTime getModifyTime() { + return modifyTime; + } + + public void setModifyTime(LocalDateTime modifyTime) { + this.modifyTime = modifyTime; + } + + @Override + public String toString() { + return "ModuleUser{" + + "id=" + id + + ", userId=" + userId + + ", moduleId=" + moduleId + + ", endTime=" + endTime + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", insertTime=" + insertTime + + ", modifyTime=" + modifyTime + + '}'; + } +} diff --git a/src/main/java/com/syzb/app/mapper/AppOrderMapper.java b/src/main/java/com/syzb/business/mapper/AppOrderMapper.java similarity index 50% rename from src/main/java/com/syzb/app/mapper/AppOrderMapper.java rename to src/main/java/com/syzb/business/mapper/AppOrderMapper.java index a66edf2..7a66a8e 100644 --- a/src/main/java/com/syzb/app/mapper/AppOrderMapper.java +++ b/src/main/java/com/syzb/business/mapper/AppOrderMapper.java @@ -1,15 +1,15 @@ -package com.syzb.app.mapper; +package com.syzb.business.mapper; -import com.syzb.app.entity.AppOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syzb.business.entity.AppOrder; /** *

- * C端订单 Mapper 接口 + * 订单表 Mapper 接口 *

* - * @author easonzhu - * @since 2024-11-07 + * @author helloSyzb + * @since 2025-02-21 */ public interface AppOrderMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/app/mapper/AppRelsMapper.java b/src/main/java/com/syzb/business/mapper/AppRelsMapper.java similarity index 68% rename from src/main/java/com/syzb/app/mapper/AppRelsMapper.java rename to src/main/java/com/syzb/business/mapper/AppRelsMapper.java index 0398c05..5567a13 100644 --- a/src/main/java/com/syzb/app/mapper/AppRelsMapper.java +++ b/src/main/java/com/syzb/business/mapper/AppRelsMapper.java @@ -1,14 +1,14 @@ -package com.syzb.app.mapper; +package com.syzb.business.mapper; -import com.syzb.app.entity.AppRels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syzb.business.entity.AppRels; /** *

* B端C端关系表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-29 */ public interface AppRelsMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/business/mapper/ModuleUserMapper.java b/src/main/java/com/syzb/business/mapper/ModuleUserMapper.java new file mode 100644 index 0000000..eed43c3 --- /dev/null +++ b/src/main/java/com/syzb/business/mapper/ModuleUserMapper.java @@ -0,0 +1,16 @@ +package com.syzb.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syzb.business.entity.ModuleUser; + +/** + *

+ * 权限用户表 Mapper 接口 + *

+ * + * @author helloSyzb + * @since 2025-02-21 + */ +public interface ModuleUserMapper extends BaseMapper { + +} diff --git a/src/main/java/com/syzb/business/schedule/BusinessTask.java b/src/main/java/com/syzb/business/schedule/BusinessTask.java new file mode 100644 index 0000000..f8b2863 --- /dev/null +++ b/src/main/java/com/syzb/business/schedule/BusinessTask.java @@ -0,0 +1,39 @@ +package com.syzb.business.schedule; + +import com.syzb.business.service.BusinessDataService; +import com.syzb.common.config.cache.CacheKey; +import com.syzb.common.service.CacheService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.concurrent.TimeUnit; + +@Component +public class BusinessTask { + + @Resource + private CacheService cacheService; + + @Resource + private BusinessDataService businessDataService; + + @Scheduled(cron = "${cron.syncOrder}") + public void syncOrder() { + cacheService.lock(CacheKey.LockKey.SYNC_ORDER, + 0, TimeUnit.SECONDS, + 30, TimeUnit.SECONDS, + businessDataService::syncOrder + ); + } + + @Scheduled(cron = "${cron.syncModuleUser}") + public void syncModuleUser() { + cacheService.lock(CacheKey.LockKey.SYNC_MODULE_USER, + 0, TimeUnit.SECONDS, + 30, TimeUnit.SECONDS, + businessDataService::syncModuleUser + ); + } + +} diff --git a/src/main/java/com/syzb/business/service/BusinessApiService.java b/src/main/java/com/syzb/business/service/BusinessApiService.java index 2879c31..a89d986 100644 --- a/src/main/java/com/syzb/business/service/BusinessApiService.java +++ b/src/main/java/com/syzb/business/service/BusinessApiService.java @@ -35,6 +35,8 @@ public class BusinessApiService { private String getOrderListUrl = "/order/getAllBatchOrderListByPage"; + private String getModuleUserListUrl = "/order/getUserModuleListByPage"; + private String authorizationDeptId = "16"; private String authorizationKey = "56e670eea5ff3a1aebbc02820e908ceb56e670eea5ff3a1aebbc02820e908ceb"; @@ -73,12 +75,15 @@ public class BusinessApiService { public List getOrderList(LocalDateTime startTime, LocalDateTime endTime) { List result = new ArrayList<>(); - String startTimeStr = LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATETIME_PATTERN); - String endTimeStr = LocalDateTimeUtil.format(endTime, DatePattern.NORM_DATETIME_PATTERN); + String startTimeStr = LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATETIME_FORMATTER); + String endTimeStr = LocalDateTimeUtil.format(endTime, DatePattern.NORM_DATETIME_FORMATTER); Integer currentPage = 1; Integer pageSize = 100; while (true) { BusinessOrderExtVO extVO = getOrderList(startTimeStr, endTimeStr, currentPage, pageSize); + if (extVO == null || extVO.getData() == null) { + break; + } result.addAll(extVO.getData()); if (extVO.getData().size() < pageSize || result.size() >= extVO.getTotal()) { break; @@ -88,7 +93,7 @@ public class BusinessApiService { return result; } - public BusinessOrderExtVO getOrderList(String startTime, String endTime, Integer currentPage, Integer pageSize) { + private BusinessOrderExtVO getOrderList(String startTime, String endTime, Integer currentPage, Integer pageSize) { Map params = new HashMap<>(); params.put("currentPage", currentPage); params.put("pageSize", pageSize); @@ -98,6 +103,37 @@ public class BusinessApiService { return vo.getData(); } + public List getModuleUserList(Integer moduleId, LocalDateTime startTime, LocalDateTime endTime) { + List result = new ArrayList<>(); + String startTimeStr = LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATETIME_FORMATTER); + String endTimeStr = LocalDateTimeUtil.format(endTime, DatePattern.NORM_DATETIME_FORMATTER); + Integer currentPage = 1; + Integer pageSize = 100; + while (true) { + BusinessModuleUserExtVO extVO = getModuleUserList(moduleId, startTimeStr, endTimeStr, currentPage, pageSize); + if (extVO == null || extVO.getData() == null) { + break; + } + result.addAll(extVO.getData()); + if (extVO.getData().size() < pageSize || result.size() >= extVO.getTotal()) { + break; + } + currentPage++; + } + return result; + } + + private BusinessModuleUserExtVO getModuleUserList(Integer moduleId, String startTime, String endTime, Integer currentPage, Integer pageSize) { + Map params = new HashMap<>(); + params.put("moduleId", moduleId); + params.put("currentPage", currentPage); + params.put("pageSize", pageSize); + params.put("updateStartTime", startTime); + params.put("updateEndTime", endTime); + BusinessModuleUserRspVO vo = post(getModuleUserListUrl, params, BusinessModuleUserRspVO.class); + return vo.getData(); + } + public static void main(String[] args) { BusinessApiService service = new BusinessApiService(); // BusinessLoginVO loginVO = service.loginByUserName("sz545138", "Abc@123"); @@ -106,8 +142,10 @@ public class BusinessApiService { // BusinessUserVO userVO = service.getUser(token); // System.out.println(JSONUtil.toJsonStr(userVO)); // service.getModuleList(userVO.getUserId().toString()); - List orderList = service.getOrderList(LocalDate.now().withDayOfYear(1).atStartOfDay(), LocalDateTime.now()); - System.out.println(JSONUtil.toJsonStr(orderList)); +// List orderList = service.getOrderList(LocalDate.now().withDayOfYear(1).atStartOfDay(), LocalDateTime.now()); +// System.out.println(JSONUtil.toJsonStr(orderList)); + List moduleUserList = service.getModuleUserList(1000, LocalDate.now().withDayOfYear(1).atStartOfDay(), LocalDateTime.now()); + System.out.println(JSONUtil.toJsonStr(moduleUserList)); } private T post(String url, Map params, Class type) { diff --git a/src/main/java/com/syzb/business/service/BusinessDataService.java b/src/main/java/com/syzb/business/service/BusinessDataService.java new file mode 100644 index 0000000..82d51ba --- /dev/null +++ b/src/main/java/com/syzb/business/service/BusinessDataService.java @@ -0,0 +1,218 @@ +package com.syzb.business.service; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.syzb.business.entity.AppOrder; +import com.syzb.business.entity.ModuleUser; +import com.syzb.business.mapper.AppOrderMapper; +import com.syzb.business.mapper.ModuleUserMapper; +import com.syzb.business.vo.BusinessModuleUserVO; +import com.syzb.business.vo.BusinessOrderVO; +import com.syzb.common.constant.IsOrNot; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +@Service +public class BusinessDataService { + + private LocalDateTime INIT_SYNC_TIME = LocalDateTime.of(2025, 1, 1, 0, 0, 0); + + @Resource + private BusinessApiService businessApiService; + + @Resource + private AppOrderMapper appOrderMapper; + + @Resource + private ModuleUserMapper moduleUserMapper; + + @Transactional(rollbackFor = Exception.class) + public void syncOrder() { + QueryWrapper wrapper = Wrappers.query() + .select("max(update_time) as update_time"); + AppOrder appOrder = appOrderMapper.selectOne(wrapper); + LocalDateTime startTime = INIT_SYNC_TIME; + if (appOrder != null && appOrder.getUpdateTime() != null) { + startTime = appOrder.getUpdateTime(); + } + LocalDateTime endTime = LocalDateTime.now(); + List orderList = businessApiService.getOrderList(startTime, endTime); + if (CollUtil.isNotEmpty(orderList)) { + for (BusinessOrderVO order : orderList) { + Integer orderId = order.getOrderId(); + AppOrder existOrder = appOrderMapper.selectById(orderId); + if (existOrder == null) { + appOrderMapper.insert(convertOrder(order, true)); + } else { + AppOrder updateOrder = convertOrder(order, false); + if (!isEquals(existOrder, updateOrder)) { + appOrderMapper.updateById(updateOrder); + } + } + } + } + } + + @Transactional(rollbackFor = Exception.class) + public void syncModuleUser() { + QueryWrapper wrapper = Wrappers.query() + .select("max(update_time) as update_time"); + ModuleUser moduleUser = moduleUserMapper.selectOne(wrapper); + LocalDateTime startTime = INIT_SYNC_TIME; + if (moduleUser != null && moduleUser.getUpdateTime() != null) { + startTime = moduleUser.getUpdateTime(); + } + LocalDateTime endTime = LocalDateTime.now(); + Set moduleIds = getModuleIds(); + for (Integer moduleId : moduleIds) { + List moduleUserList = businessApiService.getModuleUserList(moduleId, startTime, endTime); + if (CollUtil.isNotEmpty(moduleUserList)) { + for (BusinessModuleUserVO moduleUserVO : moduleUserList) { + Integer id = moduleUserVO.getId(); + ModuleUser existModuleUser = moduleUserMapper.selectById(id); + if (existModuleUser == null) { + moduleUserMapper.insert(convertModuleUser(moduleUserVO, true)); + } else { + ModuleUser updateModuleUser = convertModuleUser(moduleUserVO, false); + if (!isEquals(existModuleUser, updateModuleUser)) { + moduleUserMapper.updateById(updateModuleUser); + } + } + } + } + } + } + + private Set getModuleIds() { + // TODO + Set set = new HashSet<>(); + set.add(1000); + return set; + } + + private AppOrder convertOrder(BusinessOrderVO order, boolean isNew) { + AppOrder appOrder = new AppOrder(); + appOrder.setOrderId(order.getOrderId()); + appOrder.setProductName(order.getProductName()); + appOrder.setOrderDay(order.getOrderDay()); + appOrder.setCurrentPrice(order.getCurrentPrice()); + appOrder.setOrderState(order.getOrderState()); + appOrder.setPayStatus(order.getReceivedAmount() == null || order.getReceivedAmount().compareTo(BigDecimal.ZERO) == 0 ? IsOrNot.NOT.value : IsOrNot.IS.value); + appOrder.setOriginalPrice(order.getOriginalPrice()); + appOrder.setIsOpen(order.getIsOpen()); + appOrder.setReceivedAmount(order.getReceivedAmount()); + appOrder.setCreateTime(LocalDateTimeUtil.parse(order.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setUserId(order.getUserId().toString()); + appOrder.setMobile(order.getMobile()); + appOrder.setUmId(order.getUmId()); + appOrder.setBatchId(order.getBatchId()); + appOrder.setSku(order.getSku()); + appOrder.setChannel(order.getChannel()); + appOrder.setDepartmentId(order.getDepartmentId()); + appOrder.setOpenTime(LocalDateTimeUtil.parse(order.getOpenTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setSuspendTime(LocalDateTimeUtil.parse(order.getSuspendTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setSuspendRemark(order.getSuspendRemark()); + appOrder.setRemainingDay(order.getRemainingDay()); + appOrder.setReceivedAmountTime(LocalDateTimeUtil.parse(order.getReceivedAmountTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setStopType(order.getStopType()); + appOrder.setStopTime(LocalDateTimeUtil.parse(order.getStopTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setOrderTime(LocalDateTimeUtil.parse(order.getOrderTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setExtInfo(order.getExtInfo()); + appOrder.setRemark(order.getRemark()); + appOrder.setUpdateTime(LocalDateTimeUtil.parse(order.getUpdateTime(), DatePattern.NORM_DATETIME_FORMATTER)); + appOrder.setActivityName(order.getActivityName()); + appOrder.setHasPdf(order.getHasPdf()); + appOrder.setCanSign(order.getCanSign()); + if (StrUtil.isNotBlank(order.getExtInfo())) { + JSONObject jsonObject = JSONObject.parseObject(order.getExtInfo()); + appOrder.setProductId(jsonObject.getInteger("productId")); + appOrder.setProductType(jsonObject.getInteger("productType")); + appOrder.setSaleUserId(jsonObject.getInteger("saleUserId")); + } + if (isNew) { + appOrder.setInsertTime(LocalDateTime.now()); + } else { + appOrder.setModifyTime(LocalDateTime.now()); + } + return appOrder; + } + + private ModuleUser convertModuleUser(BusinessModuleUserVO moduleUserVO, boolean isNew) { + ModuleUser moduleUser = new ModuleUser(); + moduleUser.setId(moduleUserVO.getId()); + moduleUser.setUserId(moduleUserVO.getUserId()); + moduleUser.setModuleId(moduleUserVO.getModuleId()); + moduleUser.setEndTime(LocalDateTimeUtil.parse(moduleUserVO.getEndTime(), DatePattern.NORM_DATETIME_FORMATTER)); + moduleUser.setCreateTime(LocalDateTimeUtil.parse(moduleUserVO.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER)); + moduleUser.setUpdateTime(LocalDateTimeUtil.parse(moduleUserVO.getUpdateTime(), DatePattern.NORM_DATETIME_FORMATTER)); + if (isNew) { + moduleUser.setInsertTime(LocalDateTime.now()); + } else { + moduleUser.setModifyTime(LocalDateTime.now()); + } + return moduleUser; + } + + private boolean isEquals(AppOrder a, AppOrder b) { + return Objects.equals(a.getOrderId(), b.getOrderId()) + && Objects.equals(a.getProductName(), b.getProductName()) + && Objects.equals(a.getOrderDay(), b.getOrderDay()) + && isEquals(a.getCurrentPrice(), b.getCurrentPrice()) + && Objects.equals(a.getOrderState(), b.getOrderState()) + && isEquals(a.getOriginalPrice(), b.getOriginalPrice()) + && Objects.equals(a.getIsOpen(), b.getIsOpen()) + && isEquals(a.getReceivedAmount(), b.getReceivedAmount()) + && Objects.equals(a.getCreateTime(), b.getCreateTime()) + && Objects.equals(a.getUserId(), b.getUserId()) + && Objects.equals(a.getMobile(), b.getMobile()) + && Objects.equals(a.getUmId(), b.getUmId()) + && Objects.equals(a.getBatchId(), b.getBatchId()) + && Objects.equals(a.getSku(), b.getSku()) + && Objects.equals(a.getChannel(), b.getChannel()) + && Objects.equals(a.getDepartmentId(), b.getDepartmentId()) + && Objects.equals(a.getOpenTime(), b.getOpenTime()) + && Objects.equals(a.getSuspendTime(), b.getSuspendTime()) + && Objects.equals(a.getSuspendRemark(), b.getSuspendRemark()) + && Objects.equals(a.getRemainingDay(), b.getRemainingDay()) + && Objects.equals(a.getReceivedAmountTime(), b.getReceivedAmountTime()) + && Objects.equals(a.getStopType(), b.getStopType()) + && Objects.equals(a.getStopTime(), b.getStopTime()) + && Objects.equals(a.getOrderTime(), b.getOrderTime()) + && Objects.equals(a.getExtInfo(), b.getExtInfo()) + && Objects.equals(a.getRemark(), b.getRemark()) + && Objects.equals(a.getUpdateTime(), b.getUpdateTime()) + && Objects.equals(a.getActivityName(), b.getActivityName()) + && Objects.equals(a.getHasPdf(), b.getHasPdf()) + && Objects.equals(a.getCanSign(), b.getCanSign()) + && Objects.equals(a.getProductId(), b.getProductId()) + && Objects.equals(a.getProductType(), b.getProductType()) + && Objects.equals(a.getSaleUserId(), b.getSaleUserId()); + } + + private boolean isEquals(ModuleUser a, ModuleUser b) { + return Objects.equals(a.getId(), b.getId()) + && Objects.equals(a.getUserId(), b.getUserId()) + && Objects.equals(a.getModuleId(), b.getModuleId()) + && Objects.equals(a.getEndTime(), b.getEndTime()) + && Objects.equals(a.getCreateTime(), b.getCreateTime()) + && Objects.equals(a.getUpdateTime(), b.getUpdateTime()); + } + + private boolean isEquals(BigDecimal a, BigDecimal b) { + return a == null ? b == null : a.compareTo(b) == 0; + } + +} diff --git a/src/main/java/com/syzb/app/service/OrderQueryService.java b/src/main/java/com/syzb/business/service/OrderQueryService.java similarity index 64% rename from src/main/java/com/syzb/app/service/OrderQueryService.java rename to src/main/java/com/syzb/business/service/OrderQueryService.java index 3f74b35..66d719f 100644 --- a/src/main/java/com/syzb/app/service/OrderQueryService.java +++ b/src/main/java/com/syzb/business/service/OrderQueryService.java @@ -1,20 +1,18 @@ -package com.syzb.app.service; +package com.syzb.business.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.app.constants.AppOrderStatus; -import com.syzb.app.entity.AppOrder; -import com.syzb.app.mapper.AppOrderMapper; -import com.syzb.app.vo.OrderStatCollect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; +import com.syzb.business.entity.AppOrder; +import com.syzb.business.mapper.AppOrderMapper; +import com.syzb.business.vo.order.OrderStatCollect; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Table; -import com.syzb.video.vo.statistic.VideoLiveProductSaleVO; +import com.syzb.video.vo.statistic.ProductSaleVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -29,45 +27,32 @@ public class OrderQueryService { @Resource private AppOrderMapper appOrderMapper; - /* - * 订单状态 新订单180、已开通220、已停用/已退款90、已过期80、已取消70，关闭权限但未退款230 - * 已支付包含: 已开通220、已停用/已退款90、已过期80、关闭权限但未退款230 - * 未支付包含: 新订单180、已取消70 - */ - public static final Set PAID_STATUS = ImmutableSet.of(AppOrderStatus.OPENED.value, AppOrderStatus.REFUNDED.value, AppOrderStatus.EXPIRED.value, AppOrderStatus.CLOSED_UN_REFUNDED.value); - - public static final Set UNPAID_STATUS = ImmutableSet.of(AppOrderStatus.NEW.value, AppOrderStatus.CANCELED.value); - - public static final String PAID_STATUS_STR = PAID_STATUS.stream().map(String::valueOf).collect(Collectors.joining(",")); - - public static final String UNPAID_STATUS_STR = UNPAID_STATUS.stream().map(String::valueOf).collect(Collectors.joining(",")); - - public OrderStatCollect queryOrderCollect(Integer videoId, ProductType productType) { - return queryOrderCollect(videoId, null, productType); + public OrderStatCollect queryOrderCollect(Integer productId, ProductType productType) { + return queryOrderCollect(productId, null, productType); } - public OrderStatCollect queryOrderCollect(Collection videoIds, ProductType productType) { - return queryOrderCollect(null, videoIds, productType); + public OrderStatCollect queryOrderCollect(Collection productIds, ProductType productType) { + return queryOrderCollect(null, productIds, productType); } /** * 查询订单支付状态Map * - * @param videoId 视频ID + * @param productId 产品ID * @param productType 产品类型 * @return 订单支付状态Map key: 是否支付 value: 订单统计 */ - public OrderStatCollect queryOrderCollect(Integer videoId, Collection videoIds, @NotNull ProductType productType) { + public OrderStatCollect queryOrderCollect(Integer productId, Collection productIds, @NotNull ProductType productType) { // 计算订单汇总 QueryWrapper orderWrapper = Wrappers.query() // 用sale_user_id保存订单数量 .select("pay_status", "ifnull(count(1), 0) as sale_user_id", - "IFNULL(SUM(total_price), 0) AS total_price", - "IFNULL(SUM(pay_total), 0) AS pay_total", - "IFNULL(COUNT(distinct user_name), 0) AS product_type") - .eq(videoId != null, "video_id", videoId) - .in(CollUtil.isNotEmpty(videoIds), "video_id", videoIds) + "IFNULL(SUM(original_price), 0) AS original_price", + "IFNULL(SUM(received_amount), 0) AS received_amount", + "IFNULL(COUNT(distinct user_id), 0) AS product_type") + .eq(productId != null, "product_id", productId) + .in(CollUtil.isNotEmpty(productIds), "product_id", productIds) .eq("product_type", productType.value) .isNotNull("pay_status") .groupBy("pay_status WITH ROLLUP"); @@ -77,15 +62,15 @@ public class OrderQueryService { for (AppOrder order : orders) { if (IsOrNot.IS.value.equals(order.getPayStatus())) { result.setPayCount(order.getSaleUserId()); - result.setPayAmount(order.getPayTotal()); + result.setPayAmount(order.getReceivedAmount()); result.setPayUserCount(order.getProductType()); } else if (IsOrNot.NOT.value.equals(order.getPayStatus())) { result.setUnPayCount(order.getSaleUserId()); - result.setUnPayAmount(order.getTotalPrice()); + result.setUnPayAmount(order.getOriginalPrice()); result.setUnPayUserCount(order.getProductType()); } else if (order.getPayStatus() == null) { result.setCount(order.getSaleUserId()); - result.setOrderAmount(order.getTotalPrice()); + result.setOrderAmount(order.getOriginalPrice()); result.setUserCount(order.getProductType()); } } @@ -100,10 +85,10 @@ public class OrderQueryService { */ public Set querySubUserBySaleUser(Integer saleUserId) { QueryWrapper wrapper = Wrappers.query() - .select("distinct user_name") + .select("distinct user_id") .eq(saleUserId != null && saleUserId != 0, "sale_user_id", saleUserId); List orders = appOrderMapper.selectList(wrapper); - return orders.stream().map(AppOrder::getUserName).collect(Collectors.toSet()); + return orders.stream().map(order -> order.getUserId().toString()).collect(Collectors.toSet()); } /** @@ -118,17 +103,17 @@ public class OrderQueryService { } QueryWrapper wrapper = Wrappers.query() .select("user_name", - "IFNULL(SUM(total_price), 0) AS total_price", - "IFNULL(SUM(pay_total), 0) AS pay_total", + "IFNULL(SUM(original_price), 0) AS original_price", + "IFNULL(SUM(received_amount), 0) AS received_amount", "IFNULL(COUNT(1), 0) AS sale_user_id") .in("user_name", userIds) .eq("pay_status", IsOrNot.IS.value) .groupBy("user_name"); List orders = appOrderMapper.selectList(wrapper); - return orders.stream().collect(Collectors.toMap(AppOrder::getUserName, order -> { + return orders.stream().collect(Collectors.toMap(order -> order.getUserId().toString(), order -> { OrderStatCollect orderStatCollect = new OrderStatCollect(); - orderStatCollect.setOrderAmount(order.getTotalPrice()); - orderStatCollect.setPayAmount(order.getPayTotal()); + orderStatCollect.setOrderAmount(order.getOriginalPrice()); + orderStatCollect.setPayAmount(order.getReceivedAmount()); orderStatCollect.setPayCount(order.getSaleUserId()); return orderStatCollect; })); @@ -138,9 +123,9 @@ public class OrderQueryService { * 查询某位用户各产品的订阅订单 * * @param userId 用户ID - * @return Table row:产品类型 column:视频ID value:订单列表 + * @return Table row:产品类型 column:产品ID value:订单列表 */ - public Table> queryUserSignVideoOrders(String userId) { + public Table> queryUserSignProductOrders(String userId) { Table> table = HashBasedTable.create(); if (StrUtil.isEmpty(userId)) { return table; @@ -151,11 +136,11 @@ public class OrderQueryService { List orders = appOrderMapper.selectList(wrapper); for (AppOrder order : orders) { Integer productType = order.getProductType(); - Integer videoId = order.getVideoId(); - List list = table.get(productType, videoId); + Integer productId = order.getProductId(); + List list = table.get(productType, productId); if (list == null) { list = CollUtil.newArrayList(); - table.put(productType, videoId, list); + table.put(productType, productId, list); } list.add(order); } @@ -163,19 +148,19 @@ public class OrderQueryService { } /** - * 查询某些视频的订单周期汇总数据 + * 查询某些产品的订单周期汇总数据 * * @param productType 产品类型 - * @param videoIds 视频ID集合 + * @param productIds 产品ID集合 * @param format 周期格式 * @return 订单周期汇总Map key:周期 value:订单统计 */ - public Map queryCycleOrderCollect(@NotNull ProductType productType, Set videoIds, CycleFormat format) { + public Map queryCycleOrderCollect(@NotNull ProductType productType, Set productIds, CycleFormat format) { QueryWrapper totalWrapper = Wrappers.query() - .select("DATE_FORMAT(order_time, '" + format + "') AS order_id", - "IFNULL(SUM(total_price), 0) AS total_price", + .select("DATE_FORMAT(order_time, '" + format + "') AS product_name", + "IFNULL(SUM(original_price), 0) AS original_price", "IFNULL(COUNT(1), 0) AS sale_user_id") - .in(CollUtil.isNotEmpty(videoIds), "video_id", videoIds) + .in(CollUtil.isNotEmpty(productIds), "product_id", productIds) .eq(productType != null, "product_type", productType.value) .groupBy("DATE_FORMAT(order_time, '" + format.format + "')") // 必须用last替代orderBy不然MyBatis会移除格式里面的空格 @@ -183,25 +168,25 @@ public class OrderQueryService { List totalOrders = appOrderMapper.selectList(totalWrapper); QueryWrapper paidWrapper = Wrappers.query() - .select("DATE_FORMAT(order_time, '" + format.format + "') AS order_id", - "IFNULL(SUM(pay_total), 0) AS pay_total", + .select("DATE_FORMAT(order_time, '" + format.format + "') AS product_name", + "IFNULL(SUM(received_amount), 0) AS received_amount", "IFNULL(COUNT(1), 0) AS sale_user_id") - .in(CollUtil.isNotEmpty(videoIds), "video_id", videoIds) + .in(CollUtil.isNotEmpty(productIds), "product_id", productIds) .eq(productType != null, "product_type", productType.value) .eq("pay_status", IsOrNot.IS.value) .groupBy("DATE_FORMAT(order_time, '" + format.format + "')") // 必须用last替代orderBy不然MyBatis会移除格式里面的空格 .last("ORDER BY DATE_FORMAT(order_time, '" + format.format + "')"); List paidOrders = appOrderMapper.selectList(paidWrapper); - Map paidOrderMap = paidOrders.stream().collect(Collectors.toMap(AppOrder::getOrderId, order -> order)); - return totalOrders.stream().collect(Collectors.toMap(AppOrder::getOrderId, order -> { + Map paidOrderMap = paidOrders.stream().collect(Collectors.toMap(AppOrder::getOrderId, order -> order)); + return totalOrders.stream().collect(Collectors.toMap(AppOrder::getProductName, order -> { OrderStatCollect orderStatCollect = new OrderStatCollect(); orderStatCollect.setCount(order.getSaleUserId()); - orderStatCollect.setOrderAmount(order.getTotalPrice()); + orderStatCollect.setOrderAmount(order.getOriginalPrice()); AppOrder paidOrder = paidOrderMap.get(order.getOrderId()); if (paidOrder != null) { orderStatCollect.setPayCount(paidOrder.getSaleUserId()); - orderStatCollect.setPayAmount(paidOrder.getPayTotal()); + orderStatCollect.setPayAmount(paidOrder.getReceivedAmount()); orderStatCollect.setUnPayCount(order.getSaleUserId() - paidOrder.getSaleUserId()); } else { orderStatCollect.setPayCount(0); @@ -213,25 +198,25 @@ public class OrderQueryService { } /** - * 查询某些视频的订单统计数据 + * 查询某些产品的订单统计数据 */ - public Map queryVideoOrderCollect(ProductType productType, Set videoIds) { + public Map queryProductOrderCollect(ProductType productType, Set productIds) { QueryWrapper wrapper = Wrappers.query() - .select("video_id", - "IFNULL(SUM(total_price), 0) AS total_price", - "IFNULL(SUM(pay_total), 0) AS pay_total", + .select("product_id", + "IFNULL(SUM(original_price), 0) AS original_price", + "IFNULL(SUM(received_amount), 0) AS received_amount", "IFNULL(COUNT(1), 0) AS sale_user_id") - .in(CollUtil.isNotEmpty(videoIds), "video_id", videoIds) + .in(CollUtil.isNotEmpty(productIds), "product_id", productIds) .eq(productType != null, "product_type", productType.value) .eq("pay_status", IsOrNot.IS.value) - .groupBy("video_id"); + .groupBy("product_id"); List orders = appOrderMapper.selectList(wrapper); - return orders.stream().collect(Collectors.toMap(AppOrder::getVideoId, order -> { + return orders.stream().collect(Collectors.toMap(AppOrder::getProductId, order -> { OrderStatCollect orderStatCollect = new OrderStatCollect(); orderStatCollect.setCount(order.getSaleUserId()); orderStatCollect.setPayCount(order.getSaleUserId()); - orderStatCollect.setOrderAmount(order.getTotalPrice()); - orderStatCollect.setPayAmount(order.getPayTotal()); + orderStatCollect.setOrderAmount(order.getOriginalPrice()); + orderStatCollect.setPayAmount(order.getReceivedAmount()); return orderStatCollect; })); } @@ -239,34 +224,34 @@ public class OrderQueryService { /** * 查询直播间产品销量 */ - public List queryVideoLiveProductSale(Integer videoId) { + public List queryVideoLiveProductSale(Integer productId) { QueryWrapper wrapper = Wrappers.query() .select("product_id, product_name", - "IFNULL(SUM(pay_total), 0) AS pay_total", + "IFNULL(SUM(received_amount), 0) AS received_amount", "IFNULL(COUNT(1), 0) AS sale_user_id") - .eq("video_id", videoId) + .eq("product_id", productId) .eq("product_type", ProductType.VIDEO_SINGLE.value) .eq("pay_status", IsOrNot.IS.value) .groupBy("product_id", "product_name") .orderByDesc("IFNULL(COUNT(1), 0)"); List orders = appOrderMapper.selectList(wrapper); - return orders.stream().map(order -> new VideoLiveProductSaleVO(order.getProductName(), order.getSaleUserId(), order.getPayTotal())).collect(Collectors.toList()); + return orders.stream().map(order -> new ProductSaleVO(order.getProductName(), order.getSaleUserId(), order.getReceivedAmount())).collect(Collectors.toList()); } /** - * 查询某视频的订单用户订阅的产品名称 + * 查询某产品的订单用户订阅的产品名称 * - * @param videoId 视频ID + * @param productId 产品ID * @param payStatus 支付状态 * @return 用户订阅的产品名称Map key: 用户名 value: 产品名称列表 */ - public Map> calUserOrderName(Integer videoId, Integer payStatus) { + public Map> calUserOrderName(Integer productId, Integer payStatus) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(AppOrder::getVideoId, videoId) - .in(payStatus != null, AppOrder::getPayStatus, payStatus); + .eq(AppOrder::getProductId, productId) + .isNotNull(IsOrNot.IS.value.equals(payStatus), AppOrder::getReceivedAmount); List orderList = appOrderMapper.selectList(wrapper); return orderList.stream() - .collect(Collectors.groupingBy(AppOrder::getUserName, + .collect(Collectors.groupingBy(order -> order.getUserId().toString(), Collectors.mapping(AppOrder::getProductName, Collectors.toList()))); } diff --git a/src/main/java/com/syzb/business/vo/BusinessModuleUserExtVO.java b/src/main/java/com/syzb/business/vo/BusinessModuleUserExtVO.java new file mode 100644 index 0000000..4278b51 --- /dev/null +++ b/src/main/java/com/syzb/business/vo/BusinessModuleUserExtVO.java @@ -0,0 +1,46 @@ +package com.syzb.business.vo; + +import java.util.List; + +public class BusinessModuleUserExtVO { + + private Integer currentPage; + + private Integer pageSize; + + private Integer total; + + private List data; + + public Integer getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(Integer currentPage) { + this.currentPage = currentPage; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/src/main/java/com/syzb/business/vo/BusinessModuleUserRspVO.java b/src/main/java/com/syzb/business/vo/BusinessModuleUserRspVO.java new file mode 100644 index 0000000..853f6b2 --- /dev/null +++ b/src/main/java/com/syzb/business/vo/BusinessModuleUserRspVO.java @@ -0,0 +1,14 @@ +package com.syzb.business.vo; + +public class BusinessModuleUserRspVO extends BusinessVO { + + private BusinessModuleUserExtVO data; + + public BusinessModuleUserExtVO getData() { + return data; + } + + public void setData(BusinessModuleUserExtVO data) { + this.data = data; + } +} diff --git a/src/main/java/com/syzb/business/vo/BusinessModuleUserVO.java b/src/main/java/com/syzb/business/vo/BusinessModuleUserVO.java new file mode 100644 index 0000000..98a1235 --- /dev/null +++ b/src/main/java/com/syzb/business/vo/BusinessModuleUserVO.java @@ -0,0 +1,65 @@ +package com.syzb.business.vo; + +public class BusinessModuleUserVO { + + private Integer id; + + private Integer userId; + + private Integer moduleId; + + private String endTime; + + private String createTime; + + private String updateTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getModuleId() { + return moduleId; + } + + public void setModuleId(Integer moduleId) { + this.moduleId = moduleId; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + +} diff --git a/src/main/java/com/syzb/app/vo/OrderStatCollect.java b/src/main/java/com/syzb/business/vo/order/OrderStatCollect.java similarity index 98% rename from src/main/java/com/syzb/app/vo/OrderStatCollect.java rename to src/main/java/com/syzb/business/vo/order/OrderStatCollect.java index 41a14e5..8167333 100644 --- a/src/main/java/com/syzb/app/vo/OrderStatCollect.java +++ b/src/main/java/com/syzb/business/vo/order/OrderStatCollect.java @@ -1,4 +1,4 @@ -package com.syzb.app.vo; +package com.syzb.business.vo.order; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/syzb/common/config/cache/CacheKey.java b/src/main/java/com/syzb/common/config/cache/CacheKey.java index 5681d2e..872a308 100644 --- a/src/main/java/com/syzb/common/config/cache/CacheKey.java +++ b/src/main/java/com/syzb/common/config/cache/CacheKey.java @@ -46,6 +46,8 @@ public class CacheKey { public static final String SAVE_MESSAGE_READ = "save_message_read"; public static final String SAVE_GROUP_USER = "save_group_user"; public static final String COLLECT_GROUP_DATA = "collect_group_data"; + public static final String SYNC_ORDER = "sync_order"; + public static final String SYNC_MODULE_USER = "sync_module_user"; } // 消息主题 diff --git a/src/main/java/com/syzb/common/constant/ProductType.java b/src/main/java/com/syzb/common/constant/ProductType.java index abb3885..9baf709 100644 --- a/src/main/java/com/syzb/common/constant/ProductType.java +++ b/src/main/java/com/syzb/common/constant/ProductType.java @@ -4,7 +4,6 @@ import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import java.util.Arrays; -import java.util.List; import java.util.Optional; public enum ProductType { diff --git a/src/main/java/com/syzb/common/controller/AdvertController.java b/src/main/java/com/syzb/common/controller/AdvertController.java index 2362c83..1f6e5f1 100644 --- a/src/main/java/com/syzb/common/controller/AdvertController.java +++ b/src/main/java/com/syzb/common/controller/AdvertController.java @@ -27,7 +27,7 @@ import java.util.List; * 广告位 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ @Api(tags = "广告位") diff --git a/src/main/java/com/syzb/common/controller/RecommendController.java b/src/main/java/com/syzb/common/controller/RecommendController.java index 53608e4..f552072 100644 --- a/src/main/java/com/syzb/common/controller/RecommendController.java +++ b/src/main/java/com/syzb/common/controller/RecommendController.java @@ -26,7 +26,7 @@ import java.util.List; * 推荐位 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ @Api(tags = "推荐位") diff --git a/src/main/java/com/syzb/common/controller/ScheduleLogController.java b/src/main/java/com/syzb/common/controller/ScheduleLogController.java index a773fd2..bb113e9 100644 --- a/src/main/java/com/syzb/common/controller/ScheduleLogController.java +++ b/src/main/java/com/syzb/common/controller/ScheduleLogController.java @@ -18,7 +18,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-11-23 */ @Api(tags = "定时任务查询") diff --git a/src/main/java/com/syzb/common/controller/SensitiveWordController.java b/src/main/java/com/syzb/common/controller/SensitiveWordController.java index 2431683..2dfa76a 100644 --- a/src/main/java/com/syzb/common/controller/SensitiveWordController.java +++ b/src/main/java/com/syzb/common/controller/SensitiveWordController.java @@ -1,5 +1,6 @@ package com.syzb.common.controller; +import com.google.common.base.Charsets; import com.syzb.common.annotation.Auth; import com.syzb.common.constant.AccessRole; import com.syzb.common.query.KeywordPageQuery; @@ -10,7 +11,6 @@ import com.syzb.common.result.Pager; import com.syzb.common.service.SensitiveWordService; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.SensitiveWordVO; -import com.google.common.base.Charsets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ @Api(tags = "敏感词") diff --git a/src/main/java/com/syzb/common/controller/TagController.java b/src/main/java/com/syzb/common/controller/TagController.java index 7168de2..8dd1048 100644 --- a/src/main/java/com/syzb/common/controller/TagController.java +++ b/src/main/java/com/syzb/common/controller/TagController.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; * 标签表 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ @Api(tags = "通用标签") diff --git a/src/main/java/com/syzb/common/entity/Advert.java b/src/main/java/com/syzb/common/entity/Advert.java index 0323af6..039ff95 100644 --- a/src/main/java/com/syzb/common/entity/Advert.java +++ b/src/main/java/com/syzb/common/entity/Advert.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 广告位 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-09-26 */ public class Advert implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/BlackStock.java b/src/main/java/com/syzb/common/entity/BlackStock.java index 3b5d117..46b4c7e 100644 --- a/src/main/java/com/syzb/common/entity/BlackStock.java +++ b/src/main/java/com/syzb/common/entity/BlackStock.java @@ -10,7 +10,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-24 */ public class BlackStock implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/Comment.java b/src/main/java/com/syzb/common/entity/Comment.java index 2f28171..77d16aa 100644 --- a/src/main/java/com/syzb/common/entity/Comment.java +++ b/src/main/java/com/syzb/common/entity/Comment.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 评论表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-25 */ public class Comment implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/CommentBlack.java b/src/main/java/com/syzb/common/entity/CommentBlack.java index 117e49f..15d47b9 100644 --- a/src/main/java/com/syzb/common/entity/CommentBlack.java +++ b/src/main/java/com/syzb/common/entity/CommentBlack.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 评论禁言表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-25 */ public class CommentBlack implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/OperationLog.java b/src/main/java/com/syzb/common/entity/OperationLog.java index 38c2157..c563886 100644 --- a/src/main/java/com/syzb/common/entity/OperationLog.java +++ b/src/main/java/com/syzb/common/entity/OperationLog.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 业务操作日志表 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-04-26 */ public class OperationLog implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/Recommend.java b/src/main/java/com/syzb/common/entity/Recommend.java index 72a187b..580849d 100644 --- a/src/main/java/com/syzb/common/entity/Recommend.java +++ b/src/main/java/com/syzb/common/entity/Recommend.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 推荐位 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-09-29 */ public class Recommend implements IProduct, Serializable { diff --git a/src/main/java/com/syzb/common/entity/RiskLevel.java b/src/main/java/com/syzb/common/entity/RiskLevel.java index 5782f8d..7f5ae7f 100644 --- a/src/main/java/com/syzb/common/entity/RiskLevel.java +++ b/src/main/java/com/syzb/common/entity/RiskLevel.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 风险等级配置 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class RiskLevel implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/SafetyConfig.java b/src/main/java/com/syzb/common/entity/SafetyConfig.java index 98bbb1e..e928b9c 100644 --- a/src/main/java/com/syzb/common/entity/SafetyConfig.java +++ b/src/main/java/com/syzb/common/entity/SafetyConfig.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 系统安全设置 *

* - * @author easonzhu + * @author helloSyzb * @since 2023-08-16 */ public class SafetyConfig implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/ScheduleLog.java b/src/main/java/com/syzb/common/entity/ScheduleLog.java index dfa493a..addc73f 100644 --- a/src/main/java/com/syzb/common/entity/ScheduleLog.java +++ b/src/main/java/com/syzb/common/entity/ScheduleLog.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class ScheduleLog implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/SensitiveWord.java b/src/main/java/com/syzb/common/entity/SensitiveWord.java index d411ce7..dd805b5 100644 --- a/src/main/java/com/syzb/common/entity/SensitiveWord.java +++ b/src/main/java/com/syzb/common/entity/SensitiveWord.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-26 */ public class SensitiveWord implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/ShortUrl.java b/src/main/java/com/syzb/common/entity/ShortUrl.java index b997bae..0a60a72 100644 --- a/src/main/java/com/syzb/common/entity/ShortUrl.java +++ b/src/main/java/com/syzb/common/entity/ShortUrl.java @@ -9,7 +9,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-02 */ public class ShortUrl implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/Tag.java b/src/main/java/com/syzb/common/entity/Tag.java index 204eb34..4641bd6 100644 --- a/src/main/java/com/syzb/common/entity/Tag.java +++ b/src/main/java/com/syzb/common/entity/Tag.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 标签表 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-10-11 */ public class Tag implements Serializable { diff --git a/src/main/java/com/syzb/common/entity/UserBehaviorLog.java b/src/main/java/com/syzb/common/entity/UserBehaviorLog.java index 9f48a98..58309cf 100644 --- a/src/main/java/com/syzb/common/entity/UserBehaviorLog.java +++ b/src/main/java/com/syzb/common/entity/UserBehaviorLog.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 用户行为日志 *

* - * @author easonzhu + * @author helloSyzb * @since 2023-11-27 */ public class UserBehaviorLog implements Serializable { diff --git a/src/main/java/com/syzb/common/filter/AuthFilter.java b/src/main/java/com/syzb/common/filter/AuthFilter.java index 1078217..125f387 100644 --- a/src/main/java/com/syzb/common/filter/AuthFilter.java +++ b/src/main/java/com/syzb/common/filter/AuthFilter.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.auth0.jwt.exceptions.JWTVerificationException; import com.auth0.jwt.exceptions.TokenExpiredException; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.ClientType; import com.syzb.common.handler.BizException; @@ -14,8 +16,6 @@ import com.syzb.common.util.RequestIdUtil; import com.syzb.common.util.logger.LoggerUtil; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.FrontUserVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/syzb/common/generator/CodeGenerator.java b/src/main/java/com/syzb/common/generator/CodeGenerator.java index 16bf98f..37cc7ca 100644 --- a/src/main/java/com/syzb/common/generator/CodeGenerator.java +++ b/src/main/java/com/syzb/common/generator/CodeGenerator.java @@ -29,7 +29,7 @@ public class CodeGenerator { DataSourceConfig dsc = new DataSourceConfig .Builder("jdbc:mysql://47.96.178.171:3306/advisor_video?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8", "eason", - "mysql2025easonzhu") + "mysql2025helloSyzb") // .Builder("jdbc:mysql://172.16.9.44:3306/db_crm_dyqh?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false", // "taf", // "taf2015") @@ -44,7 +44,7 @@ public class CodeGenerator { GlobalConfig globalConfig = new GlobalConfig .Builder() .outputDir(projectPath + "/src/main/java") - .author("easonzhu") + .author("helloSyzb") .openDir(false) .fileOverride() .build(); @@ -52,7 +52,7 @@ public class CodeGenerator { // 包配置 PackageConfig packageConfig = new PackageConfig .Builder() - .parent("com") + .parent("com.syzb") .moduleName(moduleName) .build(); diff --git a/src/main/java/com/syzb/common/handler/GlobalExceptionHandler.java b/src/main/java/com/syzb/common/handler/GlobalExceptionHandler.java index 40b7da4..273c997 100644 --- a/src/main/java/com/syzb/common/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/syzb/common/handler/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ package com.syzb.common.handler; +import com.google.common.collect.ImmutableSet; import com.syzb.common.result.CommonResult; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.logger.LoggerUtil; -import com.google.common.collect.ImmutableSet; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageNotReadableException; diff --git a/src/main/java/com/syzb/common/interceptor/WebSocketAuthHandler.java b/src/main/java/com/syzb/common/interceptor/WebSocketAuthHandler.java index db03a90..85482b8 100644 --- a/src/main/java/com/syzb/common/interceptor/WebSocketAuthHandler.java +++ b/src/main/java/com/syzb/common/interceptor/WebSocketAuthHandler.java @@ -1,13 +1,13 @@ package com.syzb.common.interceptor; import cn.hutool.core.util.StrUtil; +import com.google.common.collect.ImmutableSet; import com.syzb.common.constant.ProductType; import com.syzb.common.filter.AuthFilter; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.FrontUserVO; -import com.google.common.collect.ImmutableSet; import org.springframework.messaging.Message; import org.springframework.messaging.simp.stomp.StompHeaderAccessor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/syzb/common/interceptor/WebSocketSessionHandler.java b/src/main/java/com/syzb/common/interceptor/WebSocketSessionHandler.java index 60e311f..9019c4e 100644 --- a/src/main/java/com/syzb/common/interceptor/WebSocketSessionHandler.java +++ b/src/main/java/com/syzb/common/interceptor/WebSocketSessionHandler.java @@ -1,12 +1,12 @@ package com.syzb.common.interceptor; +import com.hazelcast.map.IMap; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; import com.syzb.common.entity.OnlineUser; import com.syzb.common.vo.FrontUserVO; import com.syzb.group.service.common.GroupCacheService; import com.syzb.group.service.common.GroupMessageService; -import com.hazelcast.map.IMap; import com.syzb.video.helper.VideoHelper; import com.syzb.video.service.common.VideoCacheService; import com.syzb.video.service.common.VideoMessageService; diff --git a/src/main/java/com/syzb/common/mapper/AdvertMapper.java b/src/main/java/com/syzb/common/mapper/AdvertMapper.java index ba5b137..4785450 100644 --- a/src/main/java/com/syzb/common/mapper/AdvertMapper.java +++ b/src/main/java/com/syzb/common/mapper/AdvertMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.Advert; * 广告位 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-09-26 */ public interface AdvertMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/CommentBlackMapper.java b/src/main/java/com/syzb/common/mapper/CommentBlackMapper.java index d4061cd..56f6a94 100644 --- a/src/main/java/com/syzb/common/mapper/CommentBlackMapper.java +++ b/src/main/java/com/syzb/common/mapper/CommentBlackMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.CommentBlack; * 评论禁言表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-25 */ public interface CommentBlackMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/CommentMapper.java b/src/main/java/com/syzb/common/mapper/CommentMapper.java index b3a00f6..09a1e22 100644 --- a/src/main/java/com/syzb/common/mapper/CommentMapper.java +++ b/src/main/java/com/syzb/common/mapper/CommentMapper.java @@ -15,7 +15,7 @@ import java.util.List; * 评论表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-25 */ public interface CommentMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/OperationLogMapper.java b/src/main/java/com/syzb/common/mapper/OperationLogMapper.java index b30c18c..0d9ad15 100644 --- a/src/main/java/com/syzb/common/mapper/OperationLogMapper.java +++ b/src/main/java/com/syzb/common/mapper/OperationLogMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.OperationLog; * 业务操作日志表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-04-26 */ public interface OperationLogMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/RecommendMapper.java b/src/main/java/com/syzb/common/mapper/RecommendMapper.java index 99aa612..e006ed6 100644 --- a/src/main/java/com/syzb/common/mapper/RecommendMapper.java +++ b/src/main/java/com/syzb/common/mapper/RecommendMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.Recommend; * 推荐位 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-09-29 */ public interface RecommendMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/RiskLevelMapper.java b/src/main/java/com/syzb/common/mapper/RiskLevelMapper.java index bb7d430..89f5b44 100644 --- a/src/main/java/com/syzb/common/mapper/RiskLevelMapper.java +++ b/src/main/java/com/syzb/common/mapper/RiskLevelMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.RiskLevel; * 风险等级配置 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-10-11 */ public interface RiskLevelMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/ScheduleLogMapper.java b/src/main/java/com/syzb/common/mapper/ScheduleLogMapper.java index 94e7bc7..0709d12 100644 --- a/src/main/java/com/syzb/common/mapper/ScheduleLogMapper.java +++ b/src/main/java/com/syzb/common/mapper/ScheduleLogMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.ScheduleLog; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-11-23 */ public interface ScheduleLogMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/SensitiveWordMapper.java b/src/main/java/com/syzb/common/mapper/SensitiveWordMapper.java index b64c9c3..e527f6f 100644 --- a/src/main/java/com/syzb/common/mapper/SensitiveWordMapper.java +++ b/src/main/java/com/syzb/common/mapper/SensitiveWordMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.SensitiveWord; * 敏感词 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-26 */ public interface SensitiveWordMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/ShortUrlMapper.java b/src/main/java/com/syzb/common/mapper/ShortUrlMapper.java index 1610ed7..dde687c 100644 --- a/src/main/java/com/syzb/common/mapper/ShortUrlMapper.java +++ b/src/main/java/com/syzb/common/mapper/ShortUrlMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.ShortUrl; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-02 */ public interface ShortUrlMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/mapper/TagMapper.java b/src/main/java/com/syzb/common/mapper/TagMapper.java index c82e625..ee8b72c 100644 --- a/src/main/java/com/syzb/common/mapper/TagMapper.java +++ b/src/main/java/com/syzb/common/mapper/TagMapper.java @@ -8,7 +8,7 @@ import com.syzb.common.entity.Tag; * 标签表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-26 */ public interface TagMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/common/service/AdvertService.java b/src/main/java/com/syzb/common/service/AdvertService.java index 759538e..ebbf90d 100644 --- a/src/main/java/com/syzb/common/service/AdvertService.java +++ b/src/main/java/com/syzb/common/service/AdvertService.java @@ -4,6 +4,10 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.AdvertPosition; import com.syzb.common.constant.ProductType; @@ -20,10 +24,6 @@ import com.syzb.common.vo.AdvertAppVO; import com.syzb.common.vo.AdvertVO; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.MergeProductInfoVO; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.UserService; import org.springframework.dao.DuplicateKeyException; diff --git a/src/main/java/com/syzb/common/service/AppUserService.java b/src/main/java/com/syzb/common/service/AppUserService.java index f57d227..96092a7 100644 --- a/src/main/java/com/syzb/common/service/AppUserService.java +++ b/src/main/java/com/syzb/common/service/AppUserService.java @@ -120,7 +120,7 @@ public class AppUserService { } List moduleList = businessApiService.getModuleList(frontUserVO.getUserId()); if (CollUtil.isNotEmpty(moduleList)) { - String now = LocalDateTimeUtil.format(LocalDateTimeUtil.now(), DatePattern.NORM_DATETIME_PATTERN); + String now = LocalDateTimeUtil.format(LocalDateTimeUtil.now(), DatePattern.NORM_DATETIME_FORMATTER); for (BusinessModuleVO moduleVO : moduleList) { if (auths.contains(moduleVO.getModuleId().toString()) && moduleVO.getEndTime().compareTo(now) > 0) { return new AuthResultVO(true); diff --git a/src/main/java/com/syzb/common/service/CacheService.java b/src/main/java/com/syzb/common/service/CacheService.java index 9a0f158..335078a 100644 --- a/src/main/java/com/syzb/common/service/CacheService.java +++ b/src/main/java/com/syzb/common/service/CacheService.java @@ -1,15 +1,15 @@ package com.syzb.common.service; import com.alibaba.fastjson.JSONObject; -import com.syzb.common.config.cache.CacheKey; -import com.syzb.common.entity.ScheduleLog; -import com.syzb.common.handler.BizException; -import com.syzb.common.util.logger.LoggerUtil; import com.hazelcast.collection.ISet; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.crdt.pncounter.PNCounter; import com.hazelcast.instance.impl.HazelcastInstanceProxy; import com.hazelcast.map.IMap; +import com.syzb.common.config.cache.CacheKey; +import com.syzb.common.entity.ScheduleLog; +import com.syzb.common.handler.BizException; +import com.syzb.common.util.logger.LoggerUtil; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/syzb/common/service/CommentBlackService.java b/src/main/java/com/syzb/common/service/CommentBlackService.java index 117ca16..5b43567 100644 --- a/src/main/java/com/syzb/common/service/CommentBlackService.java +++ b/src/main/java/com/syzb/common/service/CommentBlackService.java @@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.constant.CommentBlackScope; import com.syzb.common.constant.CommentBlackStatus; import com.syzb.common.constant.CommentBlackType; @@ -21,9 +24,6 @@ import com.syzb.common.util.logger.LoggerUtil; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.CommentBlackVO; import com.syzb.common.vo.MergeProductInfoVO; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.DeptService; diff --git a/src/main/java/com/syzb/common/service/CommentService.java b/src/main/java/com/syzb/common/service/CommentService.java index 86e9794..a5f3b9c 100644 --- a/src/main/java/com/syzb/common/service/CommentService.java +++ b/src/main/java/com/syzb/common/service/CommentService.java @@ -1,12 +1,15 @@ package com.syzb.common.service; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.constant.CommentUserType; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.OrderBy; @@ -21,9 +24,6 @@ import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.CodecUtil; import com.syzb.common.vo.*; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.DeptService; diff --git a/src/main/java/com/syzb/common/service/MergeProductService.java b/src/main/java/com/syzb/common/service/MergeProductService.java index ea2c466..fad2fe3 100644 --- a/src/main/java/com/syzb/common/service/MergeProductService.java +++ b/src/main/java/com/syzb/common/service/MergeProductService.java @@ -1,5 +1,7 @@ package com.syzb.common.service; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; import com.syzb.advisor.entity.AdvisorBasic; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.advisor.vo.AdvisorInfoAppVO; @@ -10,8 +12,6 @@ import com.syzb.common.vo.MergeProductInfoVO; import com.syzb.course.query.IdAndSaleUserQuery; import com.syzb.course.service.ShortVideoService; import com.syzb.course.vo.ShortVideoVO; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; import com.syzb.video.service.app.AppVideoColumnService; import com.syzb.video.service.app.AppVideoInfoService; import com.syzb.video.vo.column.VideoColumnAppVO; diff --git a/src/main/java/com/syzb/common/service/RecommendService.java b/src/main/java/com/syzb/common/service/RecommendService.java index 1a35554..710f12f 100644 --- a/src/main/java/com/syzb/common/service/RecommendService.java +++ b/src/main/java/com/syzb/common/service/RecommendService.java @@ -1,9 +1,12 @@ package com.syzb.common.service; -import com.syzb.advisor.constant.AdvisorInfoStatus; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; +import com.syzb.advisor.constant.AdvisorInfoStatus; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.ProductType; import com.syzb.common.constant.ThirdPartyProductStatus; @@ -16,9 +19,6 @@ import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.MergeProductInfoVO; import com.syzb.common.vo.RecommendVO; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.UserService; import org.springframework.dao.DuplicateKeyException; diff --git a/src/main/java/com/syzb/common/service/SensitiveWordService.java b/src/main/java/com/syzb/common/service/SensitiveWordService.java index 79dc463..7377268 100644 --- a/src/main/java/com/syzb/common/service/SensitiveWordService.java +++ b/src/main/java/com/syzb/common/service/SensitiveWordService.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 服务类 *

* - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ diff --git a/src/main/java/com/syzb/common/service/TagService.java b/src/main/java/com/syzb/common/service/TagService.java index 6ae48b1..6b4f642 100644 --- a/src/main/java/com/syzb/common/service/TagService.java +++ b/src/main/java/com/syzb/common/service/TagService.java @@ -1,11 +1,12 @@ package com.syzb.common.service; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.constant.IsActive; import com.syzb.common.constant.ProductType; import com.syzb.common.entity.Tag; @@ -19,7 +20,6 @@ import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.TagVO; -import com.hazelcast.core.HazelcastInstance; import com.syzb.video.service.common.VideoCommonService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/syzb/common/service/UrlService.java b/src/main/java/com/syzb/common/service/UrlService.java index 32c0819..1aa1dee 100644 --- a/src/main/java/com/syzb/common/service/UrlService.java +++ b/src/main/java/com/syzb/common/service/UrlService.java @@ -3,6 +3,8 @@ package com.syzb.common.service; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.entity.ShortUrl; import com.syzb.common.handler.BizException; @@ -10,8 +12,6 @@ import com.syzb.common.mapper.ShortUrlMapper; import com.syzb.common.query.UrlResizeQuery; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.ShortUrlGenerator; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/syzb/common/state/StateMachine.java b/src/main/java/com/syzb/common/state/StateMachine.java index 30745ae..5a5aaac 100644 --- a/src/main/java/com/syzb/common/state/StateMachine.java +++ b/src/main/java/com/syzb/common/state/StateMachine.java @@ -1,11 +1,11 @@ package com.syzb.common.state; import cn.hutool.core.map.MapUtil; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; import org.springframework.util.CollectionUtils; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Map; /** * 简单状态机 * - * @author easonzhu + * @author helloSyzb * @since 2022-08-30 */ public class StateMachine { diff --git a/src/main/java/com/syzb/course/entity/Course.java b/src/main/java/com/syzb/course/entity/Course.java index 3fdd181..6b8a66e 100644 --- a/src/main/java/com/syzb/course/entity/Course.java +++ b/src/main/java/com/syzb/course/entity/Course.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 课程表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public class Course implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/CourseContent.java b/src/main/java/com/syzb/course/entity/CourseContent.java index 5b2f29f..63ff7ad 100644 --- a/src/main/java/com/syzb/course/entity/CourseContent.java +++ b/src/main/java/com/syzb/course/entity/CourseContent.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 课程内容表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public class CourseContent implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/CoursePackage.java b/src/main/java/com/syzb/course/entity/CoursePackage.java index d2fceff..5207e69 100644 --- a/src/main/java/com/syzb/course/entity/CoursePackage.java +++ b/src/main/java/com/syzb/course/entity/CoursePackage.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 甄选服务表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-30 */ public class CoursePackage implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/CoursePackageContent.java b/src/main/java/com/syzb/course/entity/CoursePackageContent.java index e9e4987..0e3ba5f 100644 --- a/src/main/java/com/syzb/course/entity/CoursePackageContent.java +++ b/src/main/java/com/syzb/course/entity/CoursePackageContent.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 甄选服务内容表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-03 */ public class CoursePackageContent implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/MainTab.java b/src/main/java/com/syzb/course/entity/MainTab.java index c2c1438..33a29d6 100644 --- a/src/main/java/com/syzb/course/entity/MainTab.java +++ b/src/main/java/com/syzb/course/entity/MainTab.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 首页Tab表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-23 */ public class MainTab implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/Page.java b/src/main/java/com/syzb/course/entity/Page.java index 92bc772..d867e76 100644 --- a/src/main/java/com/syzb/course/entity/Page.java +++ b/src/main/java/com/syzb/course/entity/Page.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-16 */ public class Page implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/Serial.java b/src/main/java/com/syzb/course/entity/Serial.java index ba5553c..24ef82e 100644 --- a/src/main/java/com/syzb/course/entity/Serial.java +++ b/src/main/java/com/syzb/course/entity/Serial.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 合集表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public class Serial implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/SerialContent.java b/src/main/java/com/syzb/course/entity/SerialContent.java index 2e9bf51..5db2939 100644 --- a/src/main/java/com/syzb/course/entity/SerialContent.java +++ b/src/main/java/com/syzb/course/entity/SerialContent.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 合集内容表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-16 */ public class SerialContent implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideo.java b/src/main/java/com/syzb/course/entity/ShortVideo.java index aa16b64..c0ba25e 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideo.java +++ b/src/main/java/com/syzb/course/entity/ShortVideo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 短视频 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public class ShortVideo implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoCart.java b/src/main/java/com/syzb/course/entity/ShortVideoCart.java index 0980738..0b6e1e3 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoCart.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoCart.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 短视频购物车商品 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public class ShortVideoCart implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoCartClick.java b/src/main/java/com/syzb/course/entity/ShortVideoCartClick.java index f238548..b30f6d6 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoCartClick.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoCartClick.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 短视频购物车点击 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-14 */ public class ShortVideoCartClick implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoFavor.java b/src/main/java/com/syzb/course/entity/ShortVideoFavor.java index 9966872..c8277f7 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoFavor.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoFavor.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 短视频点赞 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public class ShortVideoFavor implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoSale.java b/src/main/java/com/syzb/course/entity/ShortVideoSale.java index 8302d42..cfa9c85 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoSale.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoSale.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 短视频营销表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-14 */ public class ShortVideoSale implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoShare.java b/src/main/java/com/syzb/course/entity/ShortVideoShare.java index 3dd9423..2e86eed 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoShare.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoShare.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 短视频分享 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-03 */ public class ShortVideoShare implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/ShortVideoWatch.java b/src/main/java/com/syzb/course/entity/ShortVideoWatch.java index b40f29b..2d49fff 100644 --- a/src/main/java/com/syzb/course/entity/ShortVideoWatch.java +++ b/src/main/java/com/syzb/course/entity/ShortVideoWatch.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 短视频观看 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-02 */ public class ShortVideoWatch implements Serializable { diff --git a/src/main/java/com/syzb/course/entity/WorkWeixin.java b/src/main/java/com/syzb/course/entity/WorkWeixin.java index 67298cd..5cab4d9 100644 --- a/src/main/java/com/syzb/course/entity/WorkWeixin.java +++ b/src/main/java/com/syzb/course/entity/WorkWeixin.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 企业微信表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-30 */ public class WorkWeixin implements Serializable { diff --git a/src/main/java/com/syzb/course/mapper/CourseContentMapper.java b/src/main/java/com/syzb/course/mapper/CourseContentMapper.java index 3fd14aa..e6bf0dd 100644 --- a/src/main/java/com/syzb/course/mapper/CourseContentMapper.java +++ b/src/main/java/com/syzb/course/mapper/CourseContentMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.CourseContent; * 课程内容表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public interface CourseContentMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/CourseMapper.java b/src/main/java/com/syzb/course/mapper/CourseMapper.java index 54af7a7..c14bf0e 100644 --- a/src/main/java/com/syzb/course/mapper/CourseMapper.java +++ b/src/main/java/com/syzb/course/mapper/CourseMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.Course; * 课程表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public interface CourseMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/CoursePackageContentMapper.java b/src/main/java/com/syzb/course/mapper/CoursePackageContentMapper.java index 1333305..be2e7c5 100644 --- a/src/main/java/com/syzb/course/mapper/CoursePackageContentMapper.java +++ b/src/main/java/com/syzb/course/mapper/CoursePackageContentMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.CoursePackageContent; * 甄选服务内容表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-03 */ public interface CoursePackageContentMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/CoursePackageMapper.java b/src/main/java/com/syzb/course/mapper/CoursePackageMapper.java index c29cf10..9c80777 100644 --- a/src/main/java/com/syzb/course/mapper/CoursePackageMapper.java +++ b/src/main/java/com/syzb/course/mapper/CoursePackageMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.CoursePackage; * 甄选服务表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-30 */ public interface CoursePackageMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/MainTabMapper.java b/src/main/java/com/syzb/course/mapper/MainTabMapper.java index 30f606c..fd28b84 100644 --- a/src/main/java/com/syzb/course/mapper/MainTabMapper.java +++ b/src/main/java/com/syzb/course/mapper/MainTabMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.MainTab; * 首页Tab表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-23 */ public interface MainTabMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/PageMapper.java b/src/main/java/com/syzb/course/mapper/PageMapper.java index 3655eb1..8aed6f0 100644 --- a/src/main/java/com/syzb/course/mapper/PageMapper.java +++ b/src/main/java/com/syzb/course/mapper/PageMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.Page; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-16 */ public interface PageMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/SerialContentMapper.java b/src/main/java/com/syzb/course/mapper/SerialContentMapper.java index a260022..f92241f 100644 --- a/src/main/java/com/syzb/course/mapper/SerialContentMapper.java +++ b/src/main/java/com/syzb/course/mapper/SerialContentMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.SerialContent; * 合集内容表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-16 */ public interface SerialContentMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/SerialMapper.java b/src/main/java/com/syzb/course/mapper/SerialMapper.java index 59fdd33..508ce83 100644 --- a/src/main/java/com/syzb/course/mapper/SerialMapper.java +++ b/src/main/java/com/syzb/course/mapper/SerialMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Select; * 合集表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-15 */ public interface SerialMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoCartClickMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoCartClickMapper.java index 4215d00..5940f36 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoCartClickMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoCartClickMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.ShortVideoCartClick; * 短视频购物车点击 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-14 */ public interface ShortVideoCartClickMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoCartMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoCartMapper.java index c940028..76fccbb 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoCartMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoCartMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.ShortVideoCart; * 短视频购物车商品 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public interface ShortVideoCartMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoFavorMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoFavorMapper.java index 63dd440..2e0750a 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoFavorMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoFavorMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.ShortVideoFavor; * 短视频点赞 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public interface ShortVideoFavorMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoMapper.java index a9f53d2..1f4beb7 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Select; * 短视频 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-21 */ public interface ShortVideoMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoSaleMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoSaleMapper.java index 06b4b5c..36f2fd4 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoSaleMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoSaleMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.ShortVideoSale; * 短视频营销表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-10-14 */ public interface ShortVideoSaleMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoShareMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoShareMapper.java index 96f2d94..8d99b1d 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoShareMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoShareMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.ShortVideoShare; * 短视频分享 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-03 */ public interface ShortVideoShareMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/ShortVideoWatchMapper.java b/src/main/java/com/syzb/course/mapper/ShortVideoWatchMapper.java index 1ddc337..03e5247 100644 --- a/src/main/java/com/syzb/course/mapper/ShortVideoWatchMapper.java +++ b/src/main/java/com/syzb/course/mapper/ShortVideoWatchMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select; * 短视频观看 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-02 */ public interface ShortVideoWatchMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/mapper/WorkWeixinMapper.java b/src/main/java/com/syzb/course/mapper/WorkWeixinMapper.java index 69a796f..4e4d04a 100644 --- a/src/main/java/com/syzb/course/mapper/WorkWeixinMapper.java +++ b/src/main/java/com/syzb/course/mapper/WorkWeixinMapper.java @@ -8,7 +8,7 @@ import com.syzb.course.entity.WorkWeixin; * 企业微信表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-08-30 */ public interface WorkWeixinMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/course/service/CourseCommonService.java b/src/main/java/com/syzb/course/service/CourseCommonService.java index b0f82ba..df3819d 100644 --- a/src/main/java/com/syzb/course/service/CourseCommonService.java +++ b/src/main/java/com/syzb/course/service/CourseCommonService.java @@ -1,11 +1,11 @@ package com.syzb.course.service; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.service.AuthService; import com.syzb.video.constant.VideoUserType; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/syzb/course/service/CoursePackageService.java b/src/main/java/com/syzb/course/service/CoursePackageService.java index 4af892c..a59375d 100644 --- a/src/main/java/com/syzb/course/service/CoursePackageService.java +++ b/src/main/java/com/syzb/course/service/CoursePackageService.java @@ -2,11 +2,12 @@ package com.syzb.course.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.IsRecommend; @@ -33,7 +34,6 @@ import com.syzb.course.vo.CoursePackageContentVO; import com.syzb.course.vo.CoursePackageVO; import com.syzb.course.vo.CourseVO; import com.syzb.course.vo.SerialVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.AuthService; import com.syzb.rbac.service.UserService; diff --git a/src/main/java/com/syzb/course/service/CoursePcService.java b/src/main/java/com/syzb/course/service/CoursePcService.java index ca6f8e2..5ba54dc 100644 --- a/src/main/java/com/syzb/course/service/CoursePcService.java +++ b/src/main/java/com/syzb/course/service/CoursePcService.java @@ -2,6 +2,7 @@ package com.syzb.course.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.query.OnlyIdQuery; @@ -12,7 +13,6 @@ import com.syzb.course.entity.Course; import com.syzb.course.mapper.CourseMapper; import com.syzb.course.vo.CourseContentVO; import com.syzb.course.vo.CourseVO; -import com.hazelcast.map.IMap; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/course/service/CourseService.java b/src/main/java/com/syzb/course/service/CourseService.java index 4db7726..24d2fba 100644 --- a/src/main/java/com/syzb/course/service/CourseService.java +++ b/src/main/java/com/syzb/course/service/CourseService.java @@ -2,11 +2,12 @@ package com.syzb.course.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.IsOrNot; @@ -37,7 +38,6 @@ import com.syzb.course.query.*; import com.syzb.course.vo.CourseContentVO; import com.syzb.course.vo.CourseVO; import com.syzb.course.vo.SerialVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.AuthService; import com.syzb.rbac.service.UserService; diff --git a/src/main/java/com/syzb/course/service/MainTabService.java b/src/main/java/com/syzb/course/service/MainTabService.java index e3561a2..19af98d 100644 --- a/src/main/java/com/syzb/course/service/MainTabService.java +++ b/src/main/java/com/syzb/course/service/MainTabService.java @@ -1,9 +1,11 @@ package com.syzb.course.service; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.advisor.vo.AdvisorBasicVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; +import com.hazelcast.map.IMap; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.ProductType; @@ -17,8 +19,6 @@ import com.syzb.course.mapper.MainTabMapper; import com.syzb.course.query.MainTabQuery; import com.syzb.course.query.SaveMainTabListQuery; import com.syzb.course.vo.MainTabVO; -import com.google.common.collect.Lists; -import com.hazelcast.map.IMap; import com.syzb.rbac.service.AuthService; import com.syzb.video.constant.VideoUserType; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/course/service/PageService.java b/src/main/java/com/syzb/course/service/PageService.java index b952b49..722eb76 100644 --- a/src/main/java/com/syzb/course/service/PageService.java +++ b/src/main/java/com/syzb/course/service/PageService.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.query.OnlyIdQuery; @@ -19,7 +20,6 @@ import com.syzb.course.query.SavePageQuery; import com.syzb.course.query.UpdatePageQuery; import com.syzb.course.query.UpdatePageStatusQuery; import com.syzb.course.vo.PageVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.UserService; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/syzb/course/service/SerialService.java b/src/main/java/com/syzb/course/service/SerialService.java index 8784c37..b1a9067 100644 --- a/src/main/java/com/syzb/course/service/SerialService.java +++ b/src/main/java/com/syzb/course/service/SerialService.java @@ -2,11 +2,12 @@ package com.syzb.course.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.IsRecommend; @@ -34,7 +35,6 @@ import com.syzb.course.query.*; import com.syzb.course.vo.SerialContentVO; import com.syzb.course.vo.SerialVO; import com.syzb.course.vo.ShortVideoVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.AuthService; import com.syzb.rbac.service.UserService; diff --git a/src/main/java/com/syzb/course/service/ShortVideoService.java b/src/main/java/com/syzb/course/service/ShortVideoService.java index 3fdc398..87aa3ce 100644 --- a/src/main/java/com/syzb/course/service/ShortVideoService.java +++ b/src/main/java/com/syzb/course/service/ShortVideoService.java @@ -2,12 +2,15 @@ package com.syzb.course.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.advisor.vo.AdvisorBasicVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.collection.ISet; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.IsLike; @@ -29,9 +32,6 @@ import com.syzb.course.entity.*; import com.syzb.course.mapper.*; import com.syzb.course.query.*; import com.syzb.course.vo.*; -import com.hazelcast.collection.ISet; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.entity.WxUser; import com.syzb.rbac.mapper.WxUserMapper; diff --git a/src/main/java/com/syzb/course/service/WorkWeixinService.java b/src/main/java/com/syzb/course/service/WorkWeixinService.java index 2355d1f..e124c4e 100644 --- a/src/main/java/com/syzb/course/service/WorkWeixinService.java +++ b/src/main/java/com/syzb/course/service/WorkWeixinService.java @@ -3,6 +3,7 @@ package com.syzb.course.service; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.query.OnlyIdQuery; @@ -14,7 +15,6 @@ import com.syzb.course.mapper.WorkWeixinMapper; import com.syzb.course.query.ListWorkWeixinQuery; import com.syzb.course.query.SaveWorkWeixinQuery; import com.syzb.course.vo.WorkWeixinVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.mapper.UserDeptMapper; import com.syzb.rbac.query.ListRoleByUserIdQuery; diff --git a/src/main/java/com/syzb/group/entity/GroupCollect.java b/src/main/java/com/syzb/group/entity/GroupCollect.java index dbb9e3e..961aeca 100644 --- a/src/main/java/com/syzb/group/entity/GroupCollect.java +++ b/src/main/java/com/syzb/group/entity/GroupCollect.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 交易圈统计信息 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-13 */ public class GroupCollect implements Serializable { diff --git a/src/main/java/com/syzb/group/entity/GroupInfo.java b/src/main/java/com/syzb/group/entity/GroupInfo.java index 50805b3..b3fb3a1 100644 --- a/src/main/java/com/syzb/group/entity/GroupInfo.java +++ b/src/main/java/com/syzb/group/entity/GroupInfo.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; * 交易圈 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-05 */ public class GroupInfo implements Serializable { diff --git a/src/main/java/com/syzb/group/entity/GroupMessage.java b/src/main/java/com/syzb/group/entity/GroupMessage.java index b467d06..2c1123c 100644 --- a/src/main/java/com/syzb/group/entity/GroupMessage.java +++ b/src/main/java/com/syzb/group/entity/GroupMessage.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 交易圈互动消息 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-29 */ public class GroupMessage implements Serializable { diff --git a/src/main/java/com/syzb/group/entity/GroupMessageRead.java b/src/main/java/com/syzb/group/entity/GroupMessageRead.java index 104951c..64fd3fa 100644 --- a/src/main/java/com/syzb/group/entity/GroupMessageRead.java +++ b/src/main/java/com/syzb/group/entity/GroupMessageRead.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 交易圈消息已读 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-13 */ public class GroupMessageRead implements Serializable { diff --git a/src/main/java/com/syzb/group/entity/GroupUserFlow.java b/src/main/java/com/syzb/group/entity/GroupUserFlow.java index e75f1c1..0ad8260 100644 --- a/src/main/java/com/syzb/group/entity/GroupUserFlow.java +++ b/src/main/java/com/syzb/group/entity/GroupUserFlow.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 交易圈在线流水表 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-04 */ public class GroupUserFlow implements Serializable { diff --git a/src/main/java/com/syzb/group/mapper/GroupCollectMapper.java b/src/main/java/com/syzb/group/mapper/GroupCollectMapper.java index b4e8553..273fdaa 100644 --- a/src/main/java/com/syzb/group/mapper/GroupCollectMapper.java +++ b/src/main/java/com/syzb/group/mapper/GroupCollectMapper.java @@ -8,7 +8,7 @@ import com.syzb.group.entity.GroupCollect; * 交易圈统计信息 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-13 */ public interface GroupCollectMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/group/mapper/GroupInfoMapper.java b/src/main/java/com/syzb/group/mapper/GroupInfoMapper.java index e7814b1..111c20d 100644 --- a/src/main/java/com/syzb/group/mapper/GroupInfoMapper.java +++ b/src/main/java/com/syzb/group/mapper/GroupInfoMapper.java @@ -8,7 +8,7 @@ import com.syzb.group.entity.GroupInfo; * 交易圈 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-05 */ public interface GroupInfoMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/group/mapper/GroupMessageMapper.java b/src/main/java/com/syzb/group/mapper/GroupMessageMapper.java index b92fa15..4e68060 100644 --- a/src/main/java/com/syzb/group/mapper/GroupMessageMapper.java +++ b/src/main/java/com/syzb/group/mapper/GroupMessageMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 交易圈互动消息 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-29 */ public interface GroupMessageMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/group/mapper/GroupMessageReadMapper.java b/src/main/java/com/syzb/group/mapper/GroupMessageReadMapper.java index 901ee03..4ecf0b3 100644 --- a/src/main/java/com/syzb/group/mapper/GroupMessageReadMapper.java +++ b/src/main/java/com/syzb/group/mapper/GroupMessageReadMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 交易圈消息已读 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-13 */ public interface GroupMessageReadMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/group/mapper/GroupUserFlowMapper.java b/src/main/java/com/syzb/group/mapper/GroupUserFlowMapper.java index 1946ad0..08e23a4 100644 --- a/src/main/java/com/syzb/group/mapper/GroupUserFlowMapper.java +++ b/src/main/java/com/syzb/group/mapper/GroupUserFlowMapper.java @@ -17,7 +17,7 @@ import java.util.List; * 交易圈在线流水表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-02-04 */ public interface GroupUserFlowMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/group/service/GroupInfoService.java b/src/main/java/com/syzb/group/service/GroupInfoService.java index 76b4a85..65f6074 100644 --- a/src/main/java/com/syzb/group/service/GroupInfoService.java +++ b/src/main/java/com/syzb/group/service/GroupInfoService.java @@ -1,11 +1,12 @@ package com.syzb.group.service; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.query.OnlyIdQuery; @@ -31,7 +32,6 @@ import com.syzb.group.query.QueryGroupCollectQuery; import com.syzb.group.query.info.*; import com.syzb.group.vo.GroupCollectVO; import com.syzb.group.vo.GroupVO; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.AuthService; import com.syzb.rbac.service.UserService; diff --git a/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java b/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java index 53ceb3b..abd3945 100644 --- a/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java +++ b/src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java @@ -1,11 +1,12 @@ package com.syzb.group.service.admin; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.advisor.vo.AdvisorBasicVO; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.map.IMap; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -27,7 +28,6 @@ import com.syzb.group.service.GroupInfoService; import com.syzb.group.service.common.GroupCacheService; import com.syzb.group.service.common.GroupMessageService; import com.syzb.group.vo.message.GroupMessageVO; -import com.hazelcast.map.IMap; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/syzb/group/service/common/GroupCacheService.java b/src/main/java/com/syzb/group/service/common/GroupCacheService.java index 7d40ce2..38cf221 100644 --- a/src/main/java/com/syzb/group/service/common/GroupCacheService.java +++ b/src/main/java/com/syzb/group/service/common/GroupCacheService.java @@ -1,8 +1,12 @@ package com.syzb.group.service.common; -import com.syzb.advisor.vo.AdvisorBasicVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.hazelcast.sql.SqlResult; +import com.hazelcast.sql.SqlRow; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.entity.OnlineUser; @@ -19,10 +23,6 @@ import com.syzb.group.mapper.GroupMessageReadMapper; import com.syzb.group.mapper.GroupUserFlowMapper; import com.syzb.group.vo.message.GroupMessageReadVO; import com.syzb.group.vo.message.GroupMessageVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; -import com.hazelcast.sql.SqlResult; -import com.hazelcast.sql.SqlRow; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -30,7 +30,8 @@ import java.time.LocalDate; import java.util.*; import java.util.concurrent.TimeUnit; -import static com.syzb.common.config.cache.CacheKey.*; +import static com.syzb.common.config.cache.CacheKey.GROUP; +import static com.syzb.common.config.cache.CacheKey.GROUP_ONLINE_USER; @Service public class GroupCacheService { diff --git a/src/main/java/com/syzb/group/service/common/GroupCommonService.java b/src/main/java/com/syzb/group/service/common/GroupCommonService.java index e280bfa..d770e6e 100644 --- a/src/main/java/com/syzb/group/service/common/GroupCommonService.java +++ b/src/main/java/com/syzb/group/service/common/GroupCommonService.java @@ -5,6 +5,8 @@ import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.entity.OnlineUser; @@ -16,8 +18,6 @@ import com.syzb.group.mapper.*; import com.syzb.group.vo.GroupVO; import com.syzb.group.vo.message.GroupMessageReadVO; import com.syzb.group.vo.message.GroupMessageVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/syzb/group/service/common/GroupMessageService.java b/src/main/java/com/syzb/group/service/common/GroupMessageService.java index bb77f11..751c4ff 100644 --- a/src/main/java/com/syzb/group/service/common/GroupMessageService.java +++ b/src/main/java/com/syzb/group/service/common/GroupMessageService.java @@ -1,6 +1,8 @@ package com.syzb.group.service.common; import cn.hutool.json.JSONUtil; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.topic.ITopic; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; @@ -12,8 +14,6 @@ import com.syzb.group.constant.GroupMessageType; import com.syzb.group.entity.GroupMessage; import com.syzb.group.vo.message.GroupMessageVO; import com.syzb.group.vo.message.GroupWsMessageVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.topic.ITopic; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/rbac/controller/AuthController.java b/src/main/java/com/syzb/rbac/controller/AuthController.java index c03f566..68ef784 100644 --- a/src/main/java/com/syzb/rbac/controller/AuthController.java +++ b/src/main/java/com/syzb/rbac/controller/AuthController.java @@ -26,7 +26,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC鉴权") diff --git a/src/main/java/com/syzb/rbac/controller/DeptController.java b/src/main/java/com/syzb/rbac/controller/DeptController.java index 7ca1116..22a1c63 100644 --- a/src/main/java/com/syzb/rbac/controller/DeptController.java +++ b/src/main/java/com/syzb/rbac/controller/DeptController.java @@ -22,7 +22,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC部门") diff --git a/src/main/java/com/syzb/rbac/controller/MenuController.java b/src/main/java/com/syzb/rbac/controller/MenuController.java index d833d72..5529cca 100644 --- a/src/main/java/com/syzb/rbac/controller/MenuController.java +++ b/src/main/java/com/syzb/rbac/controller/MenuController.java @@ -24,7 +24,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC菜单") diff --git a/src/main/java/com/syzb/rbac/controller/PermissionController.java b/src/main/java/com/syzb/rbac/controller/PermissionController.java index 567e7f8..e517138 100644 --- a/src/main/java/com/syzb/rbac/controller/PermissionController.java +++ b/src/main/java/com/syzb/rbac/controller/PermissionController.java @@ -24,7 +24,7 @@ import javax.annotation.Resource; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC权限") diff --git a/src/main/java/com/syzb/rbac/controller/RoleController.java b/src/main/java/com/syzb/rbac/controller/RoleController.java index 5657bee..258856c 100644 --- a/src/main/java/com/syzb/rbac/controller/RoleController.java +++ b/src/main/java/com/syzb/rbac/controller/RoleController.java @@ -25,7 +25,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC角色") diff --git a/src/main/java/com/syzb/rbac/controller/UserController.java b/src/main/java/com/syzb/rbac/controller/UserController.java index c66d63c..11b603c 100644 --- a/src/main/java/com/syzb/rbac/controller/UserController.java +++ b/src/main/java/com/syzb/rbac/controller/UserController.java @@ -25,7 +25,7 @@ import java.util.List; * 前端控制器 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ @Api(tags = "RBAC用户") diff --git a/src/main/java/com/syzb/rbac/entity/Dept.java b/src/main/java/com/syzb/rbac/entity/Dept.java index c8b8b52..30ad537 100644 --- a/src/main/java/com/syzb/rbac/entity/Dept.java +++ b/src/main/java/com/syzb/rbac/entity/Dept.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class Dept implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/Menu.java b/src/main/java/com/syzb/rbac/entity/Menu.java index 9457e0d..343220f 100644 --- a/src/main/java/com/syzb/rbac/entity/Menu.java +++ b/src/main/java/com/syzb/rbac/entity/Menu.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class Menu implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/Permission.java b/src/main/java/com/syzb/rbac/entity/Permission.java index 0d12640..ea918a5 100644 --- a/src/main/java/com/syzb/rbac/entity/Permission.java +++ b/src/main/java/com/syzb/rbac/entity/Permission.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public class Permission implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/Role.java b/src/main/java/com/syzb/rbac/entity/Role.java index 8accbc7..8887de2 100644 --- a/src/main/java/com/syzb/rbac/entity/Role.java +++ b/src/main/java/com/syzb/rbac/entity/Role.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class Role implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/RolesMenus.java b/src/main/java/com/syzb/rbac/entity/RolesMenus.java index 856710f..b86ec1b 100644 --- a/src/main/java/com/syzb/rbac/entity/RolesMenus.java +++ b/src/main/java/com/syzb/rbac/entity/RolesMenus.java @@ -9,7 +9,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class RolesMenus implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/RolesPermissions.java b/src/main/java/com/syzb/rbac/entity/RolesPermissions.java index c886f3e..f360c95 100644 --- a/src/main/java/com/syzb/rbac/entity/RolesPermissions.java +++ b/src/main/java/com/syzb/rbac/entity/RolesPermissions.java @@ -9,7 +9,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class RolesPermissions implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/UserBlackList.java b/src/main/java/com/syzb/rbac/entity/UserBlackList.java index 81bbdb9..c62bf5e 100644 --- a/src/main/java/com/syzb/rbac/entity/UserBlackList.java +++ b/src/main/java/com/syzb/rbac/entity/UserBlackList.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 用户黑名单 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-12-25 */ public class UserBlackList implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/UserDept.java b/src/main/java/com/syzb/rbac/entity/UserDept.java index c1106cc..1d93439 100644 --- a/src/main/java/com/syzb/rbac/entity/UserDept.java +++ b/src/main/java/com/syzb/rbac/entity/UserDept.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-06 */ public class UserDept implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/UserLogin.java b/src/main/java/com/syzb/rbac/entity/UserLogin.java index 3918f87..8cad93e 100644 --- a/src/main/java/com/syzb/rbac/entity/UserLogin.java +++ b/src/main/java/com/syzb/rbac/entity/UserLogin.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-06 */ public class UserLogin implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/UserRoleEntity.java b/src/main/java/com/syzb/rbac/entity/UserRoleEntity.java index 2c0a24e..14f873f 100644 --- a/src/main/java/com/syzb/rbac/entity/UserRoleEntity.java +++ b/src/main/java/com/syzb/rbac/entity/UserRoleEntity.java @@ -7,7 +7,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-14 */ public class UserRoleEntity extends UsersRoles implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/UsersRoles.java b/src/main/java/com/syzb/rbac/entity/UsersRoles.java index f5c588b..3be159a 100644 --- a/src/main/java/com/syzb/rbac/entity/UsersRoles.java +++ b/src/main/java/com/syzb/rbac/entity/UsersRoles.java @@ -9,7 +9,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2022-11-09 */ public class UsersRoles implements Serializable { diff --git a/src/main/java/com/syzb/rbac/entity/WxUser.java b/src/main/java/com/syzb/rbac/entity/WxUser.java index 3f927c0..85a2965 100644 --- a/src/main/java/com/syzb/rbac/entity/WxUser.java +++ b/src/main/java/com/syzb/rbac/entity/WxUser.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-05 */ public class WxUser implements Serializable { diff --git a/src/main/java/com/syzb/rbac/mapper/DeptMapper.java b/src/main/java/com/syzb/rbac/mapper/DeptMapper.java index 3bd92ec..701d0cf 100644 --- a/src/main/java/com/syzb/rbac/mapper/DeptMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/DeptMapper.java @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface DeptMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/MenuMapper.java b/src/main/java/com/syzb/rbac/mapper/MenuMapper.java index ecc12e6..424c73d 100644 --- a/src/main/java/com/syzb/rbac/mapper/MenuMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/MenuMapper.java @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface MenuMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/PermissionMapper.java b/src/main/java/com/syzb/rbac/mapper/PermissionMapper.java index 2f061a2..e1254b2 100644 --- a/src/main/java/com/syzb/rbac/mapper/PermissionMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/PermissionMapper.java @@ -12,7 +12,7 @@ import java.util.List; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface PermissionMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/RoleMapper.java b/src/main/java/com/syzb/rbac/mapper/RoleMapper.java index 7c292d3..50048d8 100644 --- a/src/main/java/com/syzb/rbac/mapper/RoleMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/RoleMapper.java @@ -13,7 +13,7 @@ import java.util.List; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface RoleMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/RolesMenusMapper.java b/src/main/java/com/syzb/rbac/mapper/RolesMenusMapper.java index 4014d9b..e5c512c 100644 --- a/src/main/java/com/syzb/rbac/mapper/RolesMenusMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/RolesMenusMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.RolesMenus; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface RolesMenusMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/RolesPermissionsMapper.java b/src/main/java/com/syzb/rbac/mapper/RolesPermissionsMapper.java index 03c8585..ccd9e19 100644 --- a/src/main/java/com/syzb/rbac/mapper/RolesPermissionsMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/RolesPermissionsMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.RolesPermissions; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface RolesPermissionsMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/UserBlackListMapper.java b/src/main/java/com/syzb/rbac/mapper/UserBlackListMapper.java index 9304870..10827f7 100644 --- a/src/main/java/com/syzb/rbac/mapper/UserBlackListMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/UserBlackListMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.UserBlackList; * 用户黑名单 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-12-25 */ public interface UserBlackListMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/UserDeptMapper.java b/src/main/java/com/syzb/rbac/mapper/UserDeptMapper.java index c5ead4f..8835b99 100644 --- a/src/main/java/com/syzb/rbac/mapper/UserDeptMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/UserDeptMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.UserDept; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-06 */ public interface UserDeptMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/UserLoginMapper.java b/src/main/java/com/syzb/rbac/mapper/UserLoginMapper.java index c0980a8..d87267f 100644 --- a/src/main/java/com/syzb/rbac/mapper/UserLoginMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/UserLoginMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Update; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2025-01-06 */ public interface UserLoginMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/UsersRolesMapper.java b/src/main/java/com/syzb/rbac/mapper/UsersRolesMapper.java index 1a07ef9..f0f95ea 100644 --- a/src/main/java/com/syzb/rbac/mapper/UsersRolesMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/UsersRolesMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.UsersRoles; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2021-09-04 */ public interface UsersRolesMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/rbac/mapper/WxUserMapper.java b/src/main/java/com/syzb/rbac/mapper/WxUserMapper.java index 384b2ed..4c7395f 100644 --- a/src/main/java/com/syzb/rbac/mapper/WxUserMapper.java +++ b/src/main/java/com/syzb/rbac/mapper/WxUserMapper.java @@ -8,7 +8,7 @@ import com.syzb.rbac.entity.WxUser; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-05 */ public interface WxUserMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/rbac/service/AuthService.java b/src/main/java/com/syzb/rbac/service/AuthService.java index d9bdf43..4ad8954 100644 --- a/src/main/java/com/syzb/rbac/service/AuthService.java +++ b/src/main/java/com/syzb/rbac/service/AuthService.java @@ -1,11 +1,13 @@ package com.syzb.rbac.service; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.advisor.entity.AdvisorBasic; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.advisor.vo.AdvisorInfoAdminVO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.AccessRole; import com.syzb.common.constant.UserStatus; @@ -17,8 +19,6 @@ import com.syzb.common.util.CodecUtil; import com.syzb.common.util.JwtUtil; import com.syzb.common.vo.AuthVO; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.constant.DeptType; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; diff --git a/src/main/java/com/syzb/rbac/service/DeptService.java b/src/main/java/com/syzb/rbac/service/DeptService.java index d0f1a23..e0eeb9e 100644 --- a/src/main/java/com/syzb/rbac/service/DeptService.java +++ b/src/main/java/com/syzb/rbac/service/DeptService.java @@ -1,17 +1,17 @@ package com.syzb.rbac.service; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorInfo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.syzb.advisor.entity.AdvisorInfo; import com.syzb.common.constant.IsActive; import com.syzb.common.handler.BizException; import com.syzb.common.query.OnlyIdQuery; import com.syzb.common.result.ResponseStatus; import com.syzb.common.service.CacheService; import com.syzb.common.service.SensitiveWordService; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.mapper.DeptMapper; diff --git a/src/main/java/com/syzb/rbac/service/PermissionService.java b/src/main/java/com/syzb/rbac/service/PermissionService.java index 4d4fb9a..422639e 100644 --- a/src/main/java/com/syzb/rbac/service/PermissionService.java +++ b/src/main/java/com/syzb/rbac/service/PermissionService.java @@ -4,13 +4,13 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; import com.syzb.common.handler.BizException; import com.syzb.common.query.KeywordPageQuery; import com.syzb.common.query.OnlyIdQuery; import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.Menu; import com.syzb.rbac.entity.Permission; import com.syzb.rbac.mapper.MenuMapper; diff --git a/src/main/java/com/syzb/rbac/service/RoleService.java b/src/main/java/com/syzb/rbac/service/RoleService.java index a49e017..8d6d7c0 100644 --- a/src/main/java/com/syzb/rbac/service/RoleService.java +++ b/src/main/java/com/syzb/rbac/service/RoleService.java @@ -4,13 +4,13 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.query.OnlyIdQuery; import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.*; import com.syzb.rbac.mapper.RoleMapper; import com.syzb.rbac.mapper.RolesMenusMapper; diff --git a/src/main/java/com/syzb/rbac/service/UserBlackListService.java b/src/main/java/com/syzb/rbac/service/UserBlackListService.java index 27c0403..41a5569 100644 --- a/src/main/java/com/syzb/rbac/service/UserBlackListService.java +++ b/src/main/java/com/syzb/rbac/service/UserBlackListService.java @@ -1,10 +1,10 @@ package com.syzb.rbac.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.syzb.common.config.cache.CacheKey; -import com.syzb.common.service.CacheService; import com.hazelcast.collection.ISet; import com.hazelcast.core.HazelcastInstance; +import com.syzb.common.config.cache.CacheKey; +import com.syzb.common.service.CacheService; import com.syzb.rbac.entity.UserBlackList; import com.syzb.rbac.mapper.UserBlackListMapper; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/syzb/rbac/service/UserService.java b/src/main/java/com/syzb/rbac/service/UserService.java index b0a5931..b2666c8 100644 --- a/src/main/java/com/syzb/rbac/service/UserService.java +++ b/src/main/java/com/syzb/rbac/service/UserService.java @@ -2,13 +2,16 @@ package com.syzb.rbac.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableList; +import com.hazelcast.core.HazelcastInstance; import com.syzb.advisor.entity.AdvisorBasic; import com.syzb.advisor.entity.AdvisorInfo; import com.syzb.advisor.mapper.AdvisorInfoMapper; import com.syzb.advisor.service.AdvisorInfoService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.syzb.common.constant.UserStatus; import com.syzb.common.constant.UserType; import com.syzb.common.handler.BizException; @@ -17,9 +20,6 @@ import com.syzb.common.result.ResponseStatus; import com.syzb.common.service.CacheService; import com.syzb.common.service.SensitiveWordService; import com.syzb.common.util.CodecUtil; -import com.google.common.base.Functions; -import com.google.common.collect.ImmutableList; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.constant.RoleEnum; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; diff --git a/src/main/java/com/syzb/video/controller/admin/AdminVideoStatisticController.java b/src/main/java/com/syzb/video/controller/admin/AdminVideoStatisticController.java index f3f6914..d9d8326 100644 --- a/src/main/java/com/syzb/video/controller/admin/AdminVideoStatisticController.java +++ b/src/main/java/com/syzb/video/controller/admin/AdminVideoStatisticController.java @@ -138,8 +138,8 @@ public class AdminVideoStatisticController { @ApiOperation("带货榜单(直播数据大屏)") @GetMapping("/admin/video/live/product-sale") - public CommonResult> videoLiveProductSale(@Validated @RequestParam("videoId") Integer videoId) { - List vos = adminVideoStatisticService.videoLiveProductSale(videoId); + public CommonResult> videoLiveProductSale(@Validated @RequestParam("videoId") Integer videoId) { + List vos = adminVideoStatisticService.videoLiveProductSale(videoId); return CommonResult.success(vos); } diff --git a/src/main/java/com/syzb/video/entity/CloudMediaEntity.java b/src/main/java/com/syzb/video/entity/CloudMediaEntity.java index f5aff84..bfe4f20 100644 --- a/src/main/java/com/syzb/video/entity/CloudMediaEntity.java +++ b/src/main/java/com/syzb/video/entity/CloudMediaEntity.java @@ -2,12 +2,12 @@ package com.syzb.video.entity; import com.syzb.common.constant.IsOrNot; import com.syzb.course.entity.ShortVideo; +import com.syzb.video.constant.VideoPlayType; +import com.syzb.video.constant.VideoTransStatus; import com.tencentcloudapi.vod.v20180717.models.MediaBasicInfo; import com.tencentcloudapi.vod.v20180717.models.MediaInfo; import com.tencentcloudapi.vod.v20180717.models.MediaMetaData; import com.tencentcloudapi.vod.v20180717.models.ProcedureTask; -import com.syzb.video.constant.VideoPlayType; -import com.syzb.video.constant.VideoTransStatus; import java.time.LocalDateTime; diff --git a/src/main/java/com/syzb/video/entity/VideoBehaviorNotify.java b/src/main/java/com/syzb/video/entity/VideoBehaviorNotify.java index 2554279..d8cfdb8 100644 --- a/src/main/java/com/syzb/video/entity/VideoBehaviorNotify.java +++ b/src/main/java/com/syzb/video/entity/VideoBehaviorNotify.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-05-29 */ public class VideoBehaviorNotify implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoBrowseDetail.java b/src/main/java/com/syzb/video/entity/VideoBrowseDetail.java index 3a6297a..9837d10 100644 --- a/src/main/java/com/syzb/video/entity/VideoBrowseDetail.java +++ b/src/main/java/com/syzb/video/entity/VideoBrowseDetail.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-05-10 */ public class VideoBrowseDetail implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoCart.java b/src/main/java/com/syzb/video/entity/VideoCart.java index 771a2e3..0c6ef52 100644 --- a/src/main/java/com/syzb/video/entity/VideoCart.java +++ b/src/main/java/com/syzb/video/entity/VideoCart.java @@ -12,7 +12,7 @@ import java.util.Objects; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-18 */ public class VideoCart implements Serializable, IProduct { diff --git a/src/main/java/com/syzb/video/entity/VideoColumnFollow.java b/src/main/java/com/syzb/video/entity/VideoColumnFollow.java index e64acd0..637d6bb 100644 --- a/src/main/java/com/syzb/video/entity/VideoColumnFollow.java +++ b/src/main/java/com/syzb/video/entity/VideoColumnFollow.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 用户关注栏目 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoColumnFollow implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoListSortEntity.java b/src/main/java/com/syzb/video/entity/VideoListSortEntity.java index 5ae8acf..24c0c74 100644 --- a/src/main/java/com/syzb/video/entity/VideoListSortEntity.java +++ b/src/main/java/com/syzb/video/entity/VideoListSortEntity.java @@ -1,7 +1,7 @@ package com.syzb.video.entity; -import com.syzb.common.util.logger.LoggerUtil; import com.google.common.collect.ComparisonChain; +import com.syzb.common.util.logger.LoggerUtil; import com.syzb.video.constant.VideoLiveStatus; import com.syzb.video.constant.VideoPlayType; diff --git a/src/main/java/com/syzb/video/entity/VideoLive.java b/src/main/java/com/syzb/video/entity/VideoLive.java index 45a599c..d2228ee 100644 --- a/src/main/java/com/syzb/video/entity/VideoLive.java +++ b/src/main/java/com/syzb/video/entity/VideoLive.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 视频直播 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLive implements Serializable, IProduct { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveActivity.java b/src/main/java/com/syzb/video/entity/VideoLiveActivity.java index e6ad6c4..8f493e7 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveActivity.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveActivity.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveActivity implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveColumn.java b/src/main/java/com/syzb/video/entity/VideoLiveColumn.java index d4e067d..f618b12 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveColumn.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveColumn.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 视频直播专栏 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveColumn implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveColumnVideo.java b/src/main/java/com/syzb/video/entity/VideoLiveColumnVideo.java index d1a23a8..3b0ae66 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveColumnVideo.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveColumnVideo.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 视频直播专栏视频 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-18 */ public class VideoLiveColumnVideo implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveCustomer.java b/src/main/java/com/syzb/video/entity/VideoLiveCustomer.java index 289065e..ce18da2 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveCustomer.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveCustomer.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveCustomer implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveCustomerSale.java b/src/main/java/com/syzb/video/entity/VideoLiveCustomerSale.java index 83b6a8d..66aa932 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveCustomerSale.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveCustomerSale.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 营销人员于用户关系表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-05 */ public class VideoLiveCustomerSale implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveLibrary.java b/src/main/java/com/syzb/video/entity/VideoLiveLibrary.java index 59c4f46..5c4bc70 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveLibrary.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveLibrary.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 视频直播资源 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveLibrary implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveMessage.java b/src/main/java/com/syzb/video/entity/VideoLiveMessage.java index 8c298ef..441b951 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveMessage.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveMessage.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 视频直播互动消息 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveMessage implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveMix.java b/src/main/java/com/syzb/video/entity/VideoLiveMix.java index 89458ae..6b02dd6 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveMix.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveMix.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 直播混流 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-12-03 */ public class VideoLiveMix implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLivePush.java b/src/main/java/com/syzb/video/entity/VideoLivePush.java index 1d745d3..d68c004 100644 --- a/src/main/java/com/syzb/video/entity/VideoLivePush.java +++ b/src/main/java/com/syzb/video/entity/VideoLivePush.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 直播转推表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-11-14 */ public class VideoLivePush implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveRisk.java b/src/main/java/com/syzb/video/entity/VideoLiveRisk.java index bdf3ce8..30287d8 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveRisk.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveRisk.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveRisk implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveTag.java b/src/main/java/com/syzb/video/entity/VideoLiveTag.java index 57ea423..9c1890c 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveTag.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveTag.java @@ -9,7 +9,7 @@ import java.io.Serializable; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveTag implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoLiveUser.java b/src/main/java/com/syzb/video/entity/VideoLiveUser.java index 8d9a71b..3faeb55 100644 --- a/src/main/java/com/syzb/video/entity/VideoLiveUser.java +++ b/src/main/java/com/syzb/video/entity/VideoLiveUser.java @@ -14,7 +14,7 @@ import java.util.Objects; * 视频直播用户记录 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public class VideoLiveUser implements Serializable, IProduct { diff --git a/src/main/java/com/syzb/video/entity/VideoQuestionAnswer.java b/src/main/java/com/syzb/video/entity/VideoQuestionAnswer.java index c48f80d..7c6d73a 100644 --- a/src/main/java/com/syzb/video/entity/VideoQuestionAnswer.java +++ b/src/main/java/com/syzb/video/entity/VideoQuestionAnswer.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public class VideoQuestionAnswer implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoQuestionMain.java b/src/main/java/com/syzb/video/entity/VideoQuestionMain.java index 0de2365..620dc76 100644 --- a/src/main/java/com/syzb/video/entity/VideoQuestionMain.java +++ b/src/main/java/com/syzb/video/entity/VideoQuestionMain.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 问卷主题 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public class VideoQuestionMain implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoQuestionOption.java b/src/main/java/com/syzb/video/entity/VideoQuestionOption.java index d4ae922..400a4f3 100644 --- a/src/main/java/com/syzb/video/entity/VideoQuestionOption.java +++ b/src/main/java/com/syzb/video/entity/VideoQuestionOption.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public class VideoQuestionOption implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoQuestionTitle.java b/src/main/java/com/syzb/video/entity/VideoQuestionTitle.java index 8a09fac..ba8b966 100644 --- a/src/main/java/com/syzb/video/entity/VideoQuestionTitle.java +++ b/src/main/java/com/syzb/video/entity/VideoQuestionTitle.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public class VideoQuestionTitle implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoUserTimeCollect.java b/src/main/java/com/syzb/video/entity/VideoUserTimeCollect.java index 8b25103..cc220e3 100644 --- a/src/main/java/com/syzb/video/entity/VideoUserTimeCollect.java +++ b/src/main/java/com/syzb/video/entity/VideoUserTimeCollect.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 直播用户时间汇总表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-26 */ public class VideoUserTimeCollect implements Serializable { diff --git a/src/main/java/com/syzb/video/entity/VideoUserWatchCollect.java b/src/main/java/com/syzb/video/entity/VideoUserWatchCollect.java index 687d8e2..d1dd9ee 100644 --- a/src/main/java/com/syzb/video/entity/VideoUserWatchCollect.java +++ b/src/main/java/com/syzb/video/entity/VideoUserWatchCollect.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 直播用户观看汇总表 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-11-26 */ public class VideoUserWatchCollect implements Serializable { diff --git a/src/main/java/com/syzb/video/mapper/VideoBehaviorNotifyMapper.java b/src/main/java/com/syzb/video/mapper/VideoBehaviorNotifyMapper.java index d316d78..03575c0 100644 --- a/src/main/java/com/syzb/video/mapper/VideoBehaviorNotifyMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoBehaviorNotifyMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-05-29 */ public interface VideoBehaviorNotifyMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoBrowseDetailMapper.java b/src/main/java/com/syzb/video/mapper/VideoBrowseDetailMapper.java index 756e638..73bcba8 100644 --- a/src/main/java/com/syzb/video/mapper/VideoBrowseDetailMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoBrowseDetailMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoBrowseDetail; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-05-10 */ public interface VideoBrowseDetailMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoCartMapper.java b/src/main/java/com/syzb/video/mapper/VideoCartMapper.java index b505ec6..2a06c52 100644 --- a/src/main/java/com/syzb/video/mapper/VideoCartMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoCartMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoCart; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-18 */ public interface VideoCartMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoColumnFollowMapper.java b/src/main/java/com/syzb/video/mapper/VideoColumnFollowMapper.java index 374b1bc..7b0530c 100644 --- a/src/main/java/com/syzb/video/mapper/VideoColumnFollowMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoColumnFollowMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoColumnFollow; * 用户关注栏目 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoColumnFollowMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveActivityMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveActivityMapper.java index cc5812b..811755e 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveActivityMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveActivityMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveActivity; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveActivityMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveColumnMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveColumnMapper.java index 7bc0cdd..2891897 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveColumnMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveColumnMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Update; * 视频直播专栏 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveColumnMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveColumnVideoMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveColumnVideoMapper.java index 020329f..69284ed 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveColumnVideoMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveColumnVideoMapper.java @@ -13,7 +13,7 @@ import java.util.List; * 视频直播专栏视频 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-18 */ public interface VideoLiveColumnVideoMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveCustomerMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveCustomerMapper.java index 248840e..f6e53e1 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveCustomerMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveCustomerMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveCustomer; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveCustomerMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveCustomerSaleMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveCustomerSaleMapper.java index 07af912..3e00ecb 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveCustomerSaleMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveCustomerSaleMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveCustomerSale; * 营销人员于用户关系表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-07-05 */ public interface VideoLiveCustomerSaleMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveLibraryMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveLibraryMapper.java index c77fc20..c672871 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveLibraryMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveLibraryMapper.java @@ -15,7 +15,7 @@ import java.util.List; * 视频直播资源 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveLibraryMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveMapper.java index 62741a8..6010503 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveMapper.java @@ -20,7 +20,7 @@ import java.util.List; * 视频直播 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveMapper extends BaseMapper { @@ -97,19 +97,19 @@ public interface VideoLiveMapper extends BaseMapper { @Select("SELECT v.advisor_id, COUNT(1) FROM video_live v\n" + "LEFT JOIN app_order o\n" + - "ON v.id = o.video_id AND o.product_type = 3 AND o.status IN (${status})\n" + + "ON v.id = o.video_id AND o.product_type = 3 AND o.pay_status = #{payStatus}\n" + "WHERE v.id IN (${videoIds})\n" + "GROUP BY v.advisor_id\n" + "ORDER BY COUNT(1) DESC") - Page selectAdvisorRankListOrderByOrderCount(Page toPage, @Param("videoIds") String videoIds, @Param("status") String status); + Page selectAdvisorRankListOrderByOrderCount(Page toPage, @Param("videoIds") String videoIds, @Param("payStatus") Integer payStatus); @Select("SELECT v.advisor_id, COUNT(1) FROM video_live v\n" + "LEFT JOIN app_order o\n" + - "ON v.id = o.video_id AND o.product_type = 3 AND o.status IN (${status})\n" + + "ON v.id = o.video_id AND o.product_type = 3 AND o.pay_status = #{payStatus}\n" + "WHERE v.id IN (${videoIds})\n" + "GROUP BY v.advisor_id\n" + "ORDER BY SUM(o.pay_total) DESC") - Page selectAdvisorRankListOrderByOrderAmount(Page toPage, @Param("videoIds") String videoIds, @Param("status") String status); + Page selectAdvisorRankListOrderByOrderAmount(Page toPage, @Param("videoIds") String videoIds, @Param("payStatus") Integer payStatus); @Select("SELECT v.id FROM video_live v\n" + "LEFT JOIN video_user_watch_collect w\n" + @@ -129,18 +129,18 @@ public interface VideoLiveMapper extends BaseMapper { @Select("SELECT v.id, COUNT(1) FROM video_live v\n" + "LEFT JOIN app_order o\n" + - "ON v.id = o.video_id AND o.product_type = 3 AND o.status IN (${status})\n" + + "ON v.id = o.video_id AND o.product_type = 3 AND o.status = #{payStatus}\n" + "WHERE v.id IN (${videoIds})\n" + "GROUP BY v.id\n" + "ORDER BY COUNT(1) DESC") - Page selectVideoRankListOrderByOrderCount(Page toPage, @Param("videoIds") String videoIds, @Param("status") String status); + Page selectVideoRankListOrderByOrderCount(Page toPage, @Param("videoIds") String videoIds, @Param("payStatus") Integer payStatus); @Select("SELECT v.id, COUNT(1) FROM video_live v\n" + "LEFT JOIN app_order o\n" + - "ON v.id = o.video_id AND o.product_type = 3 AND o.status IN (${status})\n" + + "ON v.id = o.video_id AND o.product_type = 3 AND o.status = #{payStatus}\n" + "WHERE v.id IN (${videoIds})\n" + "GROUP BY v.id\n" + "ORDER BY SUM(o.pay_total) DESC") - Page selectVideoRankListOrderByOrderAmount(Page toPage, @Param("videoIds") String videoIds, @Param("status") String status); + Page selectVideoRankListOrderByOrderAmount(Page toPage, @Param("videoIds") String videoIds, @Param("payStatus") Integer payStatus); } diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveMessageMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveMessageMapper.java index 7b277d7..eba7edc 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveMessageMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveMessageMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveMessage; * 视频直播互动消息 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveMessageMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveMixMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveMixMapper.java index 64c0757..2df53ae 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveMixMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveMixMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveMix; * 直播混流 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-12-03 */ public interface VideoLiveMixMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLivePushMapper.java b/src/main/java/com/syzb/video/mapper/VideoLivePushMapper.java index aaa2622..f886727 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLivePushMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLivePushMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLivePush; * 直播转推表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-11-14 */ public interface VideoLivePushMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveRiskMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveRiskMapper.java index 9366577..0173b1d 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveRiskMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveRiskMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveRiskMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveTagMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveTagMapper.java index c88ce90..3f2008a 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveTagMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveTagMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoLiveTag; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveTagMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoLiveUserMapper.java b/src/main/java/com/syzb/video/mapper/VideoLiveUserMapper.java index 6965f71..d3dae70 100644 --- a/src/main/java/com/syzb/video/mapper/VideoLiveUserMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoLiveUserMapper.java @@ -19,7 +19,7 @@ import java.util.List; * 视频直播用户记录 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-04-17 */ public interface VideoLiveUserMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoQuestionAnswerMapper.java b/src/main/java/com/syzb/video/mapper/VideoQuestionAnswerMapper.java index 4fc243a..535d2d6 100644 --- a/src/main/java/com/syzb/video/mapper/VideoQuestionAnswerMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoQuestionAnswerMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoQuestionAnswer; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public interface VideoQuestionAnswerMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoQuestionMainMapper.java b/src/main/java/com/syzb/video/mapper/VideoQuestionMainMapper.java index 633a0c0..900bda2 100644 --- a/src/main/java/com/syzb/video/mapper/VideoQuestionMainMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoQuestionMainMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Update; * 问卷主题 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public interface VideoQuestionMainMapper extends BaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoQuestionOptionMapper.java b/src/main/java/com/syzb/video/mapper/VideoQuestionOptionMapper.java index fdf1fcd..aa7382d 100644 --- a/src/main/java/com/syzb/video/mapper/VideoQuestionOptionMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoQuestionOptionMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoQuestionOption; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public interface VideoQuestionOptionMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoQuestionTitleMapper.java b/src/main/java/com/syzb/video/mapper/VideoQuestionTitleMapper.java index 48e1214..c71dfe8 100644 --- a/src/main/java/com/syzb/video/mapper/VideoQuestionTitleMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoQuestionTitleMapper.java @@ -8,7 +8,7 @@ import com.syzb.video.entity.VideoQuestionTitle; * Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-06-03 */ public interface VideoQuestionTitleMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoUserTimeCollectMapper.java b/src/main/java/com/syzb/video/mapper/VideoUserTimeCollectMapper.java index 704b1e2..0f1b6fa 100644 --- a/src/main/java/com/syzb/video/mapper/VideoUserTimeCollectMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoUserTimeCollectMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Select; * 直播用户时间汇总表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-09-26 */ public interface VideoUserTimeCollectMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/mapper/VideoUserWatchCollectMapper.java b/src/main/java/com/syzb/video/mapper/VideoUserWatchCollectMapper.java index 3a930f4..58106c8 100644 --- a/src/main/java/com/syzb/video/mapper/VideoUserWatchCollectMapper.java +++ b/src/main/java/com/syzb/video/mapper/VideoUserWatchCollectMapper.java @@ -13,7 +13,7 @@ import java.util.List; * 直播用户观看汇总表 Mapper 接口 *

* - * @author easonzhu + * @author helloSyzb * @since 2024-11-26 */ public interface VideoUserWatchCollectMapper extends EasyBaseMapper { diff --git a/src/main/java/com/syzb/video/schedule/VideoTimer.java b/src/main/java/com/syzb/video/schedule/VideoTimer.java index b206448..f3a52e7 100644 --- a/src/main/java/com/syzb/video/schedule/VideoTimer.java +++ b/src/main/java/com/syzb/video/schedule/VideoTimer.java @@ -1,11 +1,11 @@ package com.syzb.video.schedule; -import com.syzb.common.config.cache.CacheKey; -import com.syzb.common.util.WebServerInfo; -import com.syzb.common.util.logger.LoggerUtil; import com.hazelcast.cluster.Member; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.IExecutorService; +import com.syzb.common.config.cache.CacheKey; +import com.syzb.common.util.WebServerInfo; +import com.syzb.common.util.logger.LoggerUtil; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoActivityService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoActivityService.java index ca1c94f..ce60a04 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoActivityService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoActivityService.java @@ -2,20 +2,20 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.state.StateMachine; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.UserService; import com.syzb.video.constant.VideoActivityRange; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoCartService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoCartService.java index a4b48f5..8ea7bc9 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoCartService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoCartService.java @@ -1,11 +1,12 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; -import com.syzb.advisor.entity.AdvisorFollow; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Table; +import com.syzb.advisor.entity.AdvisorFollow; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -15,7 +16,6 @@ import com.syzb.common.service.MergeProductService; import com.syzb.common.state.StateMachine; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.MergeProductInfoVO; -import com.google.common.collect.Table; import com.syzb.video.constant.*; import com.syzb.video.entity.VideoCart; import com.syzb.video.entity.VideoLive; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoColumnService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoColumnService.java index c734651..fa11c52 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoColumnService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoColumnService.java @@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; import com.syzb.common.constant.RecommendOption; import com.syzb.common.handler.BizException; import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.state.StateMachine; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.service.UserService; import com.syzb.video.constant.VideoLiveColumnStatus; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoCustomerService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoCustomerService.java index aff6612..5c540de 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoCustomerService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoCustomerService.java @@ -2,16 +2,19 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.app.entity.AppOrder; -import com.syzb.app.service.CouponService; -import com.syzb.app.service.OrderQueryService; -import com.syzb.app.vo.OrderStatCollect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.app.service.CouponService; +import com.syzb.business.entity.AppOrder; +import com.syzb.business.service.OrderQueryService; +import com.syzb.business.vo.order.OrderStatCollect; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -24,9 +27,6 @@ import com.syzb.common.util.logger.LoggerUtil; import com.syzb.common.vo.BackendUserVO; import com.syzb.common.vo.MergeProductInfoVO; import com.syzb.common.vo.TagVO; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.rbac.entity.Dept; import com.syzb.rbac.entity.UserDept; import com.syzb.rbac.entity.WxUser; @@ -134,7 +134,7 @@ public class AdminVideoCustomerService { if (authSet != null && authSet.isEmpty()) { return Pager.emptyPager(); } - String existSubSQL = "select 1 from app_order o where o.user_name = video_live_customer.user_id"; + String existSubSQL = "select 1 from app_order o where o.user_id = video_live_customer.user_id"; if (authSet != null) { if (authSet.isEmpty()) { return Pager.emptyPager(); @@ -262,7 +262,7 @@ public class AdminVideoCustomerService { String userId = query.getUserId(); // Map> couponMap = couponService.queryUserCoupon(userId); - Table> signOrderTable = orderQueryService.queryUserSignVideoOrders(userId); + Table> signOrderTable = orderQueryService.queryUserSignProductOrders(userId); Map> signOrderMap = signOrderTable.row(ProductType.VIDEO_SINGLE.value); Set videoIdSet = null; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoInfoService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoInfoService.java index 48c8b81..381a2c8 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoInfoService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoInfoService.java @@ -2,13 +2,15 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.advisor.vo.AdvisorBasicVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Sets; +import com.google.common.collect.Table; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.IsOrNot; @@ -35,8 +37,6 @@ import com.syzb.course.service.SerialService; import com.syzb.course.service.ShortVideoService; import com.syzb.course.vo.CourseVO; import com.syzb.course.vo.SerialVO; -import com.google.common.collect.Sets; -import com.google.common.collect.Table; import com.syzb.rbac.service.AuthService; import com.syzb.video.constant.*; import com.syzb.video.entity.*; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoInteractionService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoInteractionService.java index 9eb7698..878ef7b 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoInteractionService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoInteractionService.java @@ -3,18 +3,18 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorFollow; -import com.syzb.advisor.mapper.AdvisorFollowMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.syzb.common.constant.IsFollow; -import com.syzb.common.constant.IsOrNot; -import com.syzb.common.entity.OnlineUser; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import com.hazelcast.map.IMap; +import com.syzb.advisor.entity.AdvisorFollow; +import com.syzb.advisor.mapper.AdvisorFollowMapper; +import com.syzb.common.constant.IsFollow; +import com.syzb.common.constant.IsOrNot; +import com.syzb.common.entity.OnlineUser; import com.syzb.video.constant.VideoLiveStatus; import com.syzb.video.constant.VideoMessageContentType; import com.syzb.video.constant.VideoMessageStatus; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoMessageService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoMessageService.java index 94eee60..ace6d48 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoMessageService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoMessageService.java @@ -1,13 +1,13 @@ package com.syzb.video.service.admin; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.advisor.vo.AdvisorBasicVO; 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.plugins.pagination.Page; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.common.constant.IsOrNot; import com.syzb.common.handler.BizException; import com.syzb.common.result.Pager; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoMixService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoMixService.java index a2dcd72..0879a8d 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoMixService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoMixService.java @@ -5,11 +5,11 @@ import com.syzb.common.constant.IsOrNot; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.logger.LoggerUtil; +import com.syzb.video.entity.VideoLiveMix; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.live.v20180801.LiveClient; import com.tencentcloudapi.live.v20180801.models.*; import com.tencentcloudapi.vod.v20180717.models.ConfirmEventsResponse; -import com.syzb.video.entity.VideoLiveMix; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoPushService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoPushService.java index 00e7d24..01bd125 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoPushService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoPushService.java @@ -6,13 +6,13 @@ import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.logger.LoggerUtil; import com.syzb.common.vo.BackendUserVO; +import com.syzb.video.entity.VideoLive; +import com.syzb.video.entity.VideoLivePush; +import com.syzb.video.service.common.VideoCloudService; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.live.v20180801.LiveClient; import com.tencentcloudapi.live.v20180801.models.*; import com.tencentcloudapi.vod.v20180717.models.ConfirmEventsResponse; -import com.syzb.video.entity.VideoLive; -import com.syzb.video.entity.VideoLivePush; -import com.syzb.video.service.common.VideoCloudService; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoQuestionService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoQuestionService.java index ff795a9..d66282f 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoQuestionService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoQuestionService.java @@ -5,14 +5,14 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.handler.BizException; import com.syzb.common.result.Pager; import com.syzb.common.result.ResponseStatus; import com.syzb.common.vo.BackendUserVO; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.video.constant.*; import com.syzb.video.entity.*; import com.syzb.video.mapper.*; diff --git a/src/main/java/com/syzb/video/service/admin/AdminVideoStatisticService.java b/src/main/java/com/syzb/video/service/admin/AdminVideoStatisticService.java index 1598a0d..aa374aa 100644 --- a/src/main/java/com/syzb/video/service/admin/AdminVideoStatisticService.java +++ b/src/main/java/com/syzb/video/service/admin/AdminVideoStatisticService.java @@ -2,15 +2,15 @@ package com.syzb.video.service.admin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; -import com.syzb.app.service.CouponService; -import com.syzb.app.service.OrderQueryService; -import com.syzb.app.vo.OrderStatCollect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; +import com.syzb.app.service.CouponService; +import com.syzb.business.service.OrderQueryService; +import com.syzb.business.vo.order.OrderStatCollect; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -422,9 +422,9 @@ public class AdminVideoStatisticService { } else if (VideoRankType.READ_TIME.value.equals(rankType)) { page = videoLiveMapper.selectAdvisorRankListOrderByWatchTime(query.toPage(), videoIdsStr); } else if (VideoRankType.ORDER_NUM.value.equals(rankType)) { - page = videoLiveMapper.selectAdvisorRankListOrderByOrderCount(query.toPage(), videoIdsStr, OrderQueryService.PAID_STATUS_STR); + page = videoLiveMapper.selectAdvisorRankListOrderByOrderCount(query.toPage(), videoIdsStr, IsOrNot.IS.value); } else if (VideoRankType.ORDER_AMOUNT.value.equals(rankType)) { - page = videoLiveMapper.selectAdvisorRankListOrderByOrderAmount(query.toPage(), videoIdsStr, OrderQueryService.PAID_STATUS_STR); + page = videoLiveMapper.selectAdvisorRankListOrderByOrderAmount(query.toPage(), videoIdsStr, IsOrNot.IS.value); } else { return Pager.emptyPager(); } @@ -457,7 +457,7 @@ public class AdminVideoStatisticService { // 点赞 Map favorNumMap = adminVideoInteractionService.queryVideoInteractionCount(videoIds, VideoUserRecordType.FAVOR, false); // 订单 - Map videoOrderCollectMap = orderQueryService.queryVideoOrderCollect(ProductType.VIDEO_SINGLE, videoIds); + Map videoOrderCollectMap = orderQueryService.queryProductOrderCollect(ProductType.VIDEO_SINGLE, videoIds); page.getRecords().forEach(vo -> { Integer advisorId = vo.getAdvisorId(); vo.setAdvisorName(advisorNameMap.get(advisorId)); @@ -527,9 +527,9 @@ public class AdminVideoStatisticService { } else if (VideoRankType.READ_TIME.value.equals(rankType)) { page = videoLiveMapper.selectVideoRankListOrderByWatchTime(query.toPage(), videoIdsStr); } else if (VideoRankType.ORDER_NUM.value.equals(rankType)) { - page = videoLiveMapper.selectVideoRankListOrderByOrderCount(query.toPage(), videoIdsStr, OrderQueryService.PAID_STATUS_STR); + page = videoLiveMapper.selectVideoRankListOrderByOrderCount(query.toPage(), videoIdsStr, IsOrNot.IS.value); } else if (VideoRankType.ORDER_AMOUNT.value.equals(rankType)) { - page = videoLiveMapper.selectVideoRankListOrderByOrderAmount(query.toPage(), videoIdsStr, OrderQueryService.PAID_STATUS_STR); + page = videoLiveMapper.selectVideoRankListOrderByOrderAmount(query.toPage(), videoIdsStr, IsOrNot.IS.value); } else { return Pager.emptyPager(); } @@ -548,7 +548,7 @@ public class AdminVideoStatisticService { // 点赞 Map favorNumMap = adminVideoInteractionService.queryVideoInteractionCount(videoIds, VideoUserRecordType.FAVOR, false); // 订单 - Map videoOrderCollectMap = orderQueryService.queryVideoOrderCollect(ProductType.VIDEO_SINGLE, videoIds); + Map videoOrderCollectMap = orderQueryService.queryProductOrderCollect(ProductType.VIDEO_SINGLE, videoIds); page.getRecords().forEach(vo -> { Integer id = vo.getId(); VideoLive video = videoMap.get(id); @@ -611,7 +611,7 @@ public class AdminVideoStatisticService { wrapper.exists("SELECT 1 FROM video_live_user c WHERE c.video_id = u.video_id AND c.user_id = u.user_id AND c.type = {0}", VideoUserRecordType.CART.value); } if (VideoCustomerType.ORDER_NOT_PAID.value.equals(type)) { - wrapper.exists("SELECT 1 FROM app_order o WHERE o.video_id = u.video_id AND o.user_name = u.user_id AND o.status IN (" + OrderQueryService.UNPAID_STATUS_STR + ")"); + wrapper.exists("SELECT 1 FROM app_order o WHERE o.video_id = u.video_id AND o.user_name = u.user_id AND o.pay_status = {0}", IsOrNot.NOT.value); } // if (VideoCustomerType.COUPON_NOT_USED.value.equals(type) || IsOrNot.IS.value.equals(hasGotCoupon)) { // if (userCouponMap.isEmpty()) { @@ -628,7 +628,7 @@ public class AdminVideoStatisticService { // wrapper.in("u.user_id", userCouponMap.keySet()); // } if (VideoCustomerType.SUBSCRIBE_PRODUCT.value.equals(type) || IsOrNot.IS.value.equals(hasBoughtPro)) { - wrapper.exists("SELECT 1 FROM app_order o WHERE o.video_id = u.video_id AND o.user_name = u.user_id AND o.status IN (" + OrderQueryService.PAID_STATUS_STR + ")"); + wrapper.exists("SELECT 1 FROM app_order o WHERE o.video_id = u.video_id AND o.user_name = u.user_id AND o.pay_status = {0}", IsOrNot.IS.value); } if (VideoCustomerType.COMPLETE_SURVEY.value.equals(type) || IsOrNot.IS.value.equals(isAnswer)) { wrapper.exists("SELECT 1 FROM video_question_answer a JOIN video_question_main q WHERE a.question_id = q.id AND a.user_id = u.user_id AND q.video_id = u.video_id"); @@ -974,7 +974,7 @@ public class AdminVideoStatisticService { * @param videoId 视频ID * @return 视频直播产品销售数据列表 */ - public List videoLiveProductSale(Integer videoId) { + public List videoLiveProductSale(Integer videoId) { return orderQueryService.queryVideoLiveProductSale(videoId); } @@ -1069,11 +1069,11 @@ public class AdminVideoStatisticService { VideoLiveOverviewVO videoLiveOverviewVO = videoLiveDataOverview(videoId); VideoLiveUserAgeVO videoLiveUserAgeVO = videoLiveUserAge(videoId); List videoLiveUserChannelVOS = videoLiveUserChannel(videoId); - List videoLiveProductSaleVOS = videoLiveProductSale(videoId); + List productSaleVOS = videoLiveProductSale(videoId); List videoUserProvinceVOS = userProvinceProportion(videoId); List videoProductSaleLineVOS = productSaleLine(videoId); List clientTypeCountVOS = queryClientTypeCount(videoId); - return new VideoScreenVO(videoLiveTrendVOS, videoLiveOverviewVO, videoLiveUserAgeVO, videoLiveUserChannelVOS, videoLiveProductSaleVOS, videoUserProvinceVOS, videoProductSaleLineVOS, clientTypeCountVOS); + return new VideoScreenVO(videoLiveTrendVOS, videoLiveOverviewVO, videoLiveUserAgeVO, videoLiveUserChannelVOS, productSaleVOS, videoUserProvinceVOS, videoProductSaleLineVOS, clientTypeCountVOS); }); } diff --git a/src/main/java/com/syzb/video/service/app/AppVideoActivityService.java b/src/main/java/com/syzb/video/service/app/AppVideoActivityService.java index bff30b9..c48af8c 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoActivityService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoActivityService.java @@ -2,12 +2,12 @@ package com.syzb.video.service.app; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.service.CacheService; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.video.constant.VideoActivityRange; import com.syzb.video.constant.VideoActivityStatus; import com.syzb.video.entity.VideoLive; diff --git a/src/main/java/com/syzb/video/service/app/AppVideoCartService.java b/src/main/java/com/syzb/video/service/app/AppVideoCartService.java index 86ef193..54e5a09 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoCartService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoCartService.java @@ -1,11 +1,11 @@ package com.syzb.video.service.app; import cn.hutool.core.collection.CollUtil; +import com.google.common.collect.Table; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; import com.syzb.common.service.MergeProductService; import com.syzb.common.vo.MergeProductInfoVO; -import com.google.common.collect.Table; import com.syzb.video.entity.VideoCart; import com.syzb.video.entity.VideoLive; import com.syzb.video.service.common.VideoCacheService; diff --git a/src/main/java/com/syzb/video/service/app/AppVideoColumnService.java b/src/main/java/com/syzb/video/service/app/AppVideoColumnService.java index 03501bf..852edea 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoColumnService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoColumnService.java @@ -3,9 +3,9 @@ package com.syzb.video.service.app; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ReflectUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.advisor.vo.AdvisorInfoAppVO; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.syzb.common.constant.IsFollow; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.IsSub; diff --git a/src/main/java/com/syzb/video/service/app/AppVideoCustomerService.java b/src/main/java/com/syzb/video/service/app/AppVideoCustomerService.java index 1ef2fe3..64a4830 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoCustomerService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoCustomerService.java @@ -3,11 +3,11 @@ package com.syzb.video.service.app; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.service.CacheService; import com.syzb.common.util.IPUtil; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.video.entity.VideoLiveCustomer; import com.syzb.video.entity.VideoLiveCustomerSale; import com.syzb.video.mapper.VideoLiveCustomerMapper; diff --git a/src/main/java/com/syzb/video/service/app/AppVideoInfoService.java b/src/main/java/com/syzb/video/service/app/AppVideoInfoService.java index 130f543..84b799d 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoInfoService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoInfoService.java @@ -3,12 +3,16 @@ package com.syzb.video.service.app; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Table; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import com.syzb.advisor.entity.AdvisorBasic; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.advisor.vo.AdvisorBasicVO; import com.syzb.advisor.vo.AdvisorInfoAppVO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsDisplay; import com.syzb.common.constant.IsOrNot; @@ -23,10 +27,6 @@ import com.syzb.common.vo.AuthResultVO; import com.syzb.common.vo.FrontUserVO; import com.syzb.common.vo.MergeProductInfoVO; import com.syzb.common.vo.TagVO; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Table; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; import com.syzb.video.constant.*; import com.syzb.video.entity.*; import com.syzb.video.helper.AbstractVideoSortComparator; diff --git a/src/main/java/com/syzb/video/service/app/AppVideoInteractionService.java b/src/main/java/com/syzb/video/service/app/AppVideoInteractionService.java index 0b8e9f1..37cbe02 100644 --- a/src/main/java/com/syzb/video/service/app/AppVideoInteractionService.java +++ b/src/main/java/com/syzb/video/service/app/AppVideoInteractionService.java @@ -5,6 +5,9 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Table; +import com.hazelcast.collection.IList; +import com.hazelcast.core.HazelcastInstance; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -14,9 +17,6 @@ import com.syzb.common.service.MergeProductService; import com.syzb.common.vo.CountVO; import com.syzb.common.vo.FrontUserVO; import com.syzb.common.vo.MergeProductInfoVO; -import com.google.common.collect.Table; -import com.hazelcast.collection.IList; -import com.hazelcast.core.HazelcastInstance; import com.syzb.video.constant.VideoNotifyType; import com.syzb.video.constant.VideoUserRecordType; import com.syzb.video.entity.*; diff --git a/src/main/java/com/syzb/video/service/common/VideoCacheService.java b/src/main/java/com/syzb/video/service/common/VideoCacheService.java index 0ead899..04fc03e 100644 --- a/src/main/java/com/syzb/video/service/common/VideoCacheService.java +++ b/src/main/java/com/syzb/video/service/common/VideoCacheService.java @@ -2,12 +2,17 @@ package com.syzb.video.service.common; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.syzb.advisor.constant.FollowOption; -import com.syzb.advisor.entity.AdvisorBasic; -import com.syzb.advisor.service.AdvisorInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hazelcast.collection.ISet; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.hazelcast.sql.SqlResult; +import com.hazelcast.sql.SqlRow; +import com.syzb.advisor.constant.FollowOption; +import com.syzb.advisor.entity.AdvisorBasic; +import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsActive; import com.syzb.common.constant.IsOrNot; @@ -31,11 +36,6 @@ import com.syzb.course.mapper.CourseContentMapper; import com.syzb.course.mapper.CourseMapper; import com.syzb.course.mapper.SerialContentMapper; import com.syzb.course.mapper.SerialMapper; -import com.hazelcast.collection.ISet; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; -import com.hazelcast.sql.SqlResult; -import com.hazelcast.sql.SqlRow; import com.syzb.rbac.service.UserService; import com.syzb.video.constant.*; import com.syzb.video.entity.*; diff --git a/src/main/java/com/syzb/video/service/common/VideoCloudService.java b/src/main/java/com/syzb/video/service/common/VideoCloudService.java index 6d6f7f4..a694686 100644 --- a/src/main/java/com/syzb/video/service/common/VideoCloudService.java +++ b/src/main/java/com/syzb/video/service/common/VideoCloudService.java @@ -8,19 +8,14 @@ import com.alibaba.fastjson.JSONObject; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTCreationException; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.syzb.common.config.TencentCloudConfig; import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.CodecUtil; import com.syzb.common.util.logger.LoggerUtil; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import com.tencentcloudapi.common.exception.TencentCloudSDKException; -import com.tencentcloudapi.live.v20180801.LiveClient; -import com.tencentcloudapi.live.v20180801.models.*; -import com.tencentcloudapi.vod.v20180717.VodClient; -import com.tencentcloudapi.vod.v20180717.models.*; import com.syzb.video.constant.VideoTransStatus; import com.syzb.video.entity.CloudMediaEntity; import com.syzb.video.entity.VideoLive; @@ -30,6 +25,11 @@ import com.syzb.video.query.common.PullVideoPlayInfoDataQuery; import com.syzb.video.vo.cloud.TaskDetailVO; import com.syzb.video.vo.cloud.VideoPlayerSignVO; import com.syzb.video.vo.info.VideoLibraryVO; +import com.tencentcloudapi.common.exception.TencentCloudSDKException; +import com.tencentcloudapi.live.v20180801.LiveClient; +import com.tencentcloudapi.live.v20180801.models.*; +import com.tencentcloudapi.vod.v20180717.VodClient; +import com.tencentcloudapi.vod.v20180717.models.*; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/syzb/video/service/common/VideoCommonService.java b/src/main/java/com/syzb/video/service/common/VideoCommonService.java index 0c157f7..a114772 100644 --- a/src/main/java/com/syzb/video/service/common/VideoCommonService.java +++ b/src/main/java/com/syzb/video/service/common/VideoCommonService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Table; import com.syzb.common.config.cache.CacheKey; import com.syzb.common.constant.IsOrNot; import com.syzb.common.constant.ProductType; @@ -14,7 +15,6 @@ import com.syzb.common.service.*; import com.syzb.common.util.Debounce; import com.syzb.common.util.RsaUtil; import com.syzb.common.util.logger.LoggerUtil; -import com.google.common.collect.Table; import com.syzb.video.constant.*; import com.syzb.video.entity.*; import com.syzb.video.helper.AbstractVideoSortComparator; diff --git a/src/main/java/com/syzb/video/service/common/VideoMessageService.java b/src/main/java/com/syzb/video/service/common/VideoMessageService.java index 810c81c..afcc38e 100644 --- a/src/main/java/com/syzb/video/service/common/VideoMessageService.java +++ b/src/main/java/com/syzb/video/service/common/VideoMessageService.java @@ -4,6 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.google.common.collect.ImmutableSet; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.hazelcast.topic.ITopic; import com.syzb.advisor.service.AdvisorInfoService; import com.syzb.common.constant.IsOrNot; import com.syzb.common.entity.OnlineUser; @@ -11,10 +15,6 @@ import com.syzb.common.handler.BizException; import com.syzb.common.result.ResponseStatus; import com.syzb.common.util.logger.LoggerUtil; import com.syzb.common.vo.FrontUserVO; -import com.google.common.collect.ImmutableSet; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; -import com.hazelcast.topic.ITopic; import com.syzb.rbac.service.UserService; import com.syzb.video.constant.*; import com.syzb.video.entity.VideoLive; diff --git a/src/main/java/com/syzb/video/vo/statistic/VideoLiveProductSaleVO.java b/src/main/java/com/syzb/video/vo/statistic/ProductSaleVO.java similarity index 80% rename from src/main/java/com/syzb/video/vo/statistic/VideoLiveProductSaleVO.java rename to src/main/java/com/syzb/video/vo/statistic/ProductSaleVO.java index a5db9a3..2768e53 100644 --- a/src/main/java/com/syzb/video/vo/statistic/VideoLiveProductSaleVO.java +++ b/src/main/java/com/syzb/video/vo/statistic/ProductSaleVO.java @@ -3,7 +3,7 @@ package com.syzb.video.vo.statistic; import java.io.Serializable; import java.math.BigDecimal; -public class VideoLiveProductSaleVO implements Serializable { +public class ProductSaleVO implements Serializable { private String productName; @@ -11,10 +11,10 @@ public class VideoLiveProductSaleVO implements Serializable { private BigDecimal saleAmount; - public VideoLiveProductSaleVO() { + public ProductSaleVO() { } - public VideoLiveProductSaleVO(String productName, Integer saleCount, BigDecimal saleAmount) { + public ProductSaleVO(String productName, Integer saleCount, BigDecimal saleAmount) { this.productName = productName; this.saleCount = saleCount; this.saleAmount = saleAmount; diff --git a/src/main/java/com/syzb/video/vo/statistic/VideoScreenVO.java b/src/main/java/com/syzb/video/vo/statistic/VideoScreenVO.java index 1d3fc0e..9f2a674 100644 --- a/src/main/java/com/syzb/video/vo/statistic/VideoScreenVO.java +++ b/src/main/java/com/syzb/video/vo/statistic/VideoScreenVO.java @@ -20,7 +20,7 @@ public class VideoScreenVO implements Serializable { private List videoLiveUserChannelVOS; @ApiModelProperty("带货榜单") - private List videoLiveProductSaleVOS; + private List productSaleVOS; @ApiModelProperty("用户省份分布") private List videoUserProvinceVOS; @@ -34,12 +34,12 @@ public class VideoScreenVO implements Serializable { public VideoScreenVO() { } - public VideoScreenVO(List videoLiveTrendVOS, VideoLiveOverviewVO videoLiveOverviewVO, VideoLiveUserAgeVO videoLiveUserAgeVO, List videoLiveUserChannelVOS, List videoLiveProductSaleVOS, List videoUserProvinceVOS, List videoProductSaleLineVOS, List clientTypeCountVOS) { + public VideoScreenVO(List videoLiveTrendVOS, VideoLiveOverviewVO videoLiveOverviewVO, VideoLiveUserAgeVO videoLiveUserAgeVO, List videoLiveUserChannelVOS, List productSaleVOS, List videoUserProvinceVOS, List videoProductSaleLineVOS, List clientTypeCountVOS) { this.videoLiveTrendVOS = videoLiveTrendVOS; this.videoLiveOverviewVO = videoLiveOverviewVO; this.videoLiveUserAgeVO = videoLiveUserAgeVO; this.videoLiveUserChannelVOS = videoLiveUserChannelVOS; - this.videoLiveProductSaleVOS = videoLiveProductSaleVOS; + this.productSaleVOS = productSaleVOS; this.videoUserProvinceVOS = videoUserProvinceVOS; this.videoProductSaleLineVOS = videoProductSaleLineVOS; this.clientTypeCountVOS = clientTypeCountVOS; @@ -77,12 +77,12 @@ public class VideoScreenVO implements Serializable { this.videoLiveUserChannelVOS = videoLiveUserChannelVOS; } - public List getVideoLiveProductSaleVOS() { - return videoLiveProductSaleVOS; + public List getVideoLiveProductSaleVOS() { + return productSaleVOS; } - public void setVideoLiveProductSaleVOS(List videoLiveProductSaleVOS) { - this.videoLiveProductSaleVOS = videoLiveProductSaleVOS; + public void setVideoLiveProductSaleVOS(List productSaleVOS) { + this.productSaleVOS = productSaleVOS; } public List getVideoUserProvinceVOS() { diff --git a/src/main/resources/conf/advisorServer.yaml b/src/main/resources/conf/advisorServer.yaml index 07aa77b..1eb14e5 100644 --- a/src/main/resources/conf/advisorServer.yaml +++ b/src/main/resources/conf/advisorServer.yaml @@ -15,11 +15,11 @@ hazelcast: serverPort: 5709 #自己作为缓存服务器监听的端口号 scheduledEnable: true cron: - collectLivingVideo: "30 0/5 * * * ?" #每分钟统计已开始但未结束的视频直播数据 - saveVideoCount: "30 1/5 * * * ?" #从cache刷新视频播放量到DB 每分钟的第10s执行 - saveVideoUserDataToDB: "30 2/5 * * * ?" - saveCustomerDataToDB: "30 3/5 * * * ?" #收集用户信息 - refreshTranscodeStatus: "30 4/5 * * * ?" #从腾讯云拉取录播上传视频信息更新到DB + collectLivingVideo: "20 0/5 * * * ?" #每分钟统计已开始但未结束的视频直播数据 + saveVideoCount: "20 1/5 * * * ?" #从cache刷新视频播放量到DB 每分钟的第10s执行 + saveVideoUserDataToDB: "20 2/5 * * * ?" + saveCustomerDataToDB: "20 3/5 * * * ?" #收集用户信息 + refreshTranscodeStatus: "20 4/5 * * * ?" #从腾讯云拉取录播上传视频信息更新到DB updateLiveStatus: "0 1 * * * ?" #更新视频录播状态 stopLivingVideo: "0 1-5 0 * * ?" #结束前一天直播中/暂停中的视频直播 collectLastWeek: "0 30 3 * * ?" #统计一周内的数据 @@ -28,6 +28,8 @@ cron: saveGroupMessageRead: "0 2/5 * * * ?" #每5分钟统计已结束48小时以内的视频直播数据 saveGroupUser: "0 3/5 * * * ?" collectGroupData: "0 4/5 * * * ?" + syncOrder: "40 0/5 * * * ?" + syncModuleUser: "40 1/5 * * * ?" user: admin: roles: 1,3,4,5 #管理员角色id，用逗号隔开