diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java index d4525d8..5fb8c12 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java @@ -109,4 +109,12 @@ public class EmployeeHostsController { return success(employeeHostsService.allocationHostsEmployee(hostsList)); } + @GetMapping("/self_page") + @Operation(summary = "获得分配给自己的主播分页") + @PreAuthorize("@ss.hasPermission('server:employee-hosts:selfquery')") + public CommonResult> getEmployeeHostsPageWithSelf(@Valid EmployeeHostsPageReqVO pageReqVO) { + PageResult pageResult = employeeHostsService.getEmployeeHostsPageWithSelf(pageReqVO); + return success(BeanUtils.toBean(pageResult, EmployeeHostsRespVO.class)); + } + } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java index 7253a22..c227554 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java @@ -13,44 +13,43 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data public class EmployeeHostsPageReqVO extends PageParam { - @Schema(description = "主播id", example = "26407") + @Schema(description = "主播id", example = "9450") private String hostsId; - @Schema(description = "用户 Id", example = "22763") + @Schema(description = "用户 Id", example = "22570") private Long userId; @Schema(description = "主播等级") private String hostsLevel; @Schema(description = "主播金币") - private Integer hostsCoins; + private Integer[] hostsCoins; - @Schema(description = "邀请类型", example = "1") + @Schema(description = "邀请类型", example = "0") private Integer invitationType; @Schema(description = "在线人数") - private Integer onlineFans; + private Integer[] onlineFans; @Schema(description = "粉丝数量") - private Integer fans; + private Integer[] fans; @Schema(description = "关注数量") - private Integer fllowernum; + private Integer[] fllowernum; @Schema(description = "昨日金币") - private Integer yesterdayCoins; + private Integer[] yesterdayCoins; @Schema(description = "主播国家") private String country; - @Schema(description = "直播类型 娱乐,游戏 ") + @Schema(description = "直播类型") private String hostsKind; - @Schema(description = "操作状态", example = "1") + @Schema(description = "操作状态", example = "0") private Integer operationStatus; @Schema(description = "数据插入时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java index e1e8300..18961d6 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java @@ -22,19 +22,40 @@ public interface EmployeeHostsMapper extends BaseMapperX { .likeIfPresent(EmployeeHostsDO::getHostsId, reqVO.getHostsId()) .eqIfPresent(EmployeeHostsDO::getUserId, reqVO.getUserId()) .eqIfPresent(EmployeeHostsDO::getHostsLevel, reqVO.getHostsLevel()) - .eqIfPresent(EmployeeHostsDO::getHostsCoins, reqVO.getHostsCoins()) + .betweenIfPresent(EmployeeHostsDO::getHostsCoins, reqVO.getHostsCoins()) .eqIfPresent(EmployeeHostsDO::getInvitationType, reqVO.getInvitationType()) - .eqIfPresent(EmployeeHostsDO::getOnlineFans, reqVO.getOnlineFans()) - .eqIfPresent(EmployeeHostsDO::getFans, reqVO.getFans()) - .eqIfPresent(EmployeeHostsDO::getFllowernum, reqVO.getFllowernum()) - .eqIfPresent(EmployeeHostsDO::getYesterdayCoins, reqVO.getYesterdayCoins()) + .betweenIfPresent(EmployeeHostsDO::getOnlineFans, reqVO.getOnlineFans()) + .betweenIfPresent(EmployeeHostsDO::getFans, reqVO.getFans()) + .betweenIfPresent(EmployeeHostsDO::getFllowernum, reqVO.getFllowernum()) + .betweenIfPresent(EmployeeHostsDO::getYesterdayCoins, reqVO.getYesterdayCoins()) .eqIfPresent(EmployeeHostsDO::getCountry, reqVO.getCountry()) - .eqIfPresent(EmployeeHostsDO::getHostsKind, reqVO.getHostsKind()) + .likeIfPresent(EmployeeHostsDO::getHostsKind, reqVO.getHostsKind()) .eqIfPresent(EmployeeHostsDO::getOperationStatus, reqVO.getOperationStatus()) .betweenIfPresent(EmployeeHostsDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(EmployeeHostsDO::getId)); } + default PageResult selectPageWithSelf(EmployeeHostsPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(EmployeeHostsDO::getHostsId, reqVO.getHostsId()) + .eqIfPresent(EmployeeHostsDO::getUserId, reqVO.getUserId()) + .eqIfPresent(EmployeeHostsDO::getHostsLevel, reqVO.getHostsLevel()) + .betweenIfPresent(EmployeeHostsDO::getHostsCoins, reqVO.getHostsCoins()) + .eqIfPresent(EmployeeHostsDO::getInvitationType, reqVO.getInvitationType()) + .betweenIfPresent(EmployeeHostsDO::getOnlineFans, reqVO.getOnlineFans()) + .betweenIfPresent(EmployeeHostsDO::getFans, reqVO.getFans()) + .betweenIfPresent(EmployeeHostsDO::getFllowernum, reqVO.getFllowernum()) + .betweenIfPresent(EmployeeHostsDO::getYesterdayCoins, reqVO.getYesterdayCoins()) + .eqIfPresent(EmployeeHostsDO::getCountry, reqVO.getCountry()) + .likeIfPresent(EmployeeHostsDO::getHostsKind, reqVO.getHostsKind()) + .eqIfPresent(EmployeeHostsDO::getOperationStatus, reqVO.getOperationStatus()) + .betweenIfPresent(EmployeeHostsDO::getCreateTime, reqVO.getCreateTime()) + .eq(EmployeeHostsDO::getUserId, reqVO.getUserId()) + .orderByDesc(EmployeeHostsDO::getId)); + } + + + int insertIgnore(EmployeeHostsDO bean); int batchInsertIgnore(List list); diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java index ded3900..da6988d 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java @@ -60,4 +60,6 @@ public interface EmployeeHostsService { PageResult getEmployeeHostsPage(EmployeeHostsPageReqVO pageReqVO); Integer allocationHostsEmployee(List hostsList); + + PageResult getEmployeeHostsPageWithSelf(@Valid EmployeeHostsPageReqVO pageReqVO); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 967586f..e44c9df 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.tkdata.service.employeehosts; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -104,4 +106,11 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { return employeeHostsMapper.batchInsertIgnore(employeeHostsDOS); } + @Override + public PageResult getEmployeeHostsPageWithSelf(EmployeeHostsPageReqVO pageReqVO) { + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + pageReqVO.setUserId(loginUser.getId()); + return employeeHostsMapper.selectPage(pageReqVO); + } + } \ No newline at end of file