diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java index 9200a015..53548e1b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiLowHeightRiskController.java @@ -4,7 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiLowHeightRisk; -import com.ruoyi.cai.service.ICaiLowHeightRiskService; +import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import com.ruoyi.cai.service.CaiLowHeightRiskService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; @@ -34,15 +35,15 @@ import java.util.Arrays; @RequestMapping("/cai/lowHeightRisk") public class CaiLowHeightRiskController extends BaseController { - private final ICaiLowHeightRiskService lowHeightRiskService; + private final CaiLowHeightRiskService lowHeightRiskService; /** * 查询高风险用户记录列表 */ @SaCheckPermission("cai:lowHeightRisk:list") @GetMapping("/list") - public TableDataInfo list(CaiLowHeightRisk bo, PageQuery pageQuery) { - Page page = lowHeightRiskService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(CaiLowHeightRiskAdminVo bo, PageQuery pageQuery) { + Page page = lowHeightRiskService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java index 0081595e..446da408 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserRiskLogController.java @@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUserRiskLog; -import com.ruoyi.cai.service.ICaiUserRiskLogService; +import com.ruoyi.cai.service.CaiUserRiskLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; @@ -34,7 +34,7 @@ import java.util.Arrays; @RequestMapping("/cai/userRiskLog") public class CaiUserRiskLogController extends BaseController { - private final ICaiUserRiskLogService userRiskLogService; + private final CaiUserRiskLogService userRiskLogService; /** * 查询高风险操作日志列表 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java new file mode 100644 index 00000000..2cfcb02f --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiAnchorAdminVo.java @@ -0,0 +1,31 @@ +package com.ruoyi.cai.dto.admin.vo; + +import com.ruoyi.cai.domain.CaiAnchor; +import lombok.Data; + +@Data +public class CaiAnchorAdminVo extends CaiAnchor { + /** + * 用户号/ID号 + */ + private String usercode; + /** + * 昵称 + */ + private String nickname; + /** + * 手机号 + */ + private String mobile; + /** + * 头像 + */ + private String avatar; + /** + * 性别 0 未知 1 女 2 男 + */ + private Integer gender; + private Integer age; + + private Long city; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java new file mode 100644 index 00000000..ff527d2a --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiLowHeightRiskAdminVo.java @@ -0,0 +1,28 @@ +package com.ruoyi.cai.dto.admin.vo; + +import com.ruoyi.cai.domain.CaiLowHeightRisk; +import lombok.Data; + +@Data +public class CaiLowHeightRiskAdminVo extends CaiLowHeightRisk { + /** + * 用户号/ID号 + */ + private String usercode; + /** + * 昵称 + */ + private String nickname; + /** + * 手机号 + */ + private String mobile; + /** + * 头像 + */ + private String avatar; + /** + * 性别 0 未知 1 女 2 男 + */ + private Integer gender; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java index 4aa1685b..c53092a0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiLowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import org.apache.ibatis.annotations.Param; /** * 高风险用户记录Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.CaiLowHeightRisk; */ public interface CaiLowHeightRiskMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") CaiLowHeightRiskAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java new file mode 100644 index 00000000..99bd365f --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java @@ -0,0 +1,18 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.CaiLowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; +import com.ruoyi.common.core.domain.PageQuery; + +/** + * 高风险用户记录Service接口 + * + * @author 77 + * @date 2023-12-22 + */ +public interface CaiLowHeightRiskService extends IService { + + Page pageAdmin(PageQuery pageQuery, CaiLowHeightRiskAdminVo bo); +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiUserRiskLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java similarity index 74% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiUserRiskLogService.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java index a1ff9a9d..ca1e0259 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiUserRiskLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiUserRiskLog; * @author 77 * @date 2023-12-22 */ -public interface ICaiUserRiskLogService extends IService { +public interface CaiUserRiskLogService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiLowHeightRiskService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiLowHeightRiskService.java deleted file mode 100644 index 4fe16a78..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ICaiLowHeightRiskService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.cai.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiLowHeightRisk; - -/** - * 高风险用户记录Service接口 - * - * @author 77 - * @date 2023-12-22 - */ -public interface ICaiLowHeightRiskService extends IService { - -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java index c969fc61..f137be40 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java @@ -1,9 +1,12 @@ package com.ruoyi.cai.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiLowHeightRisk; +import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo; import com.ruoyi.cai.mapper.CaiLowHeightRiskMapper; -import com.ruoyi.cai.service.ICaiLowHeightRiskService; +import com.ruoyi.cai.service.CaiLowHeightRiskService; +import com.ruoyi.common.core.domain.PageQuery; import org.springframework.stereotype.Service; /** @@ -13,6 +16,10 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiLowHeightRiskServiceImpl extends ServiceImpl implements ICaiLowHeightRiskService { +public class CaiLowHeightRiskServiceImpl extends ServiceImpl implements CaiLowHeightRiskService { + @Override + public Page pageAdmin(PageQuery pageQuery, CaiLowHeightRiskAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(),bo); + } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java index f448b58c..2c3c6b7e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiUserRiskLog; import com.ruoyi.cai.mapper.CaiUserRiskLogMapper; -import com.ruoyi.cai.service.ICaiUserRiskLogService; +import com.ruoyi.cai.service.CaiUserRiskLogService; import org.springframework.stereotype.Service; /** @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; * @date 2023-12-22 */ @Service -public class CaiUserRiskLogServiceImpl extends ServiceImpl implements ICaiUserRiskLogService { +public class CaiUserRiskLogServiceImpl extends ServiceImpl implements CaiUserRiskLogService { } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml index a1bf16d6..fe2dff84 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml @@ -12,6 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml index 0db77874..71661bcd 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from cai_user_member t1 join cai_user t2 on t1.user_id = t2.id where t1.status = 0 - order by t1.create_time + order by t1.create_time desc