From 54ea1cd49069a7d1b7b7d1eab08384d3449ed9ee Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Wed, 22 Nov 2023 15:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/vo/ip/IpRegionLimitRecordAdminVo.java | 6 ++++++ .../IpRegionLimitRecordAdminServiceImpl.java | 16 +++++++++++++++- .../mapper/IpRegionLimitRecordAdminMapper.xml | 2 +- .../mapper/IpRegionWhiteAdminMapper.xml | 1 + .../business/model/ip/IpRegionLimitRecord.java | 4 +--- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ip/IpRegionLimitRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ip/IpRegionLimitRecordAdminVo.java index 94b9d6e2d..949d1dbe2 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ip/IpRegionLimitRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ip/IpRegionLimitRecordAdminVo.java @@ -48,4 +48,10 @@ public class IpRegionLimitRecordAdminVo extends IpRegionLimitRecord { @ApiModelProperty("邀请码") private String inviteCode; + /** + * 多个设备 + */ + @ApiModelProperty("多个设备") + private String deviceIdStr; + } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java index 533935b92..e6f9c0079 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java @@ -1,5 +1,7 @@ package com.accompany.admin.service.ip.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.accompany.admin.mapper.ip.IpRegionLimitRecordAdminMapper; import com.accompany.admin.service.ip.IpRegionLimitRecordAdminService; import com.accompany.admin.vo.ip.IpRegionLimitRecordAdminVo; @@ -7,12 +9,14 @@ import com.accompany.business.model.ip.IpRegionLimitRecord; import com.accompany.business.model.ip.IpRegionWhite; import com.accompany.business.service.ip.IpRegionLimitRecordService; import com.accompany.business.service.ip.IpRegionWhiteService; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * @author: liaozetao @@ -34,7 +38,17 @@ public class IpRegionLimitRecordAdminServiceImpl implements IpRegionLimitRecordA @Override public Page page(String userErBanNo, Integer currentPage, Integer pageSize) { - return ipRegionLimitRecordAdminMapper.page(new Page<>(currentPage, pageSize), userErBanNo); + Page page = ipRegionLimitRecordAdminMapper.page(new Page<>(currentPage, pageSize), userErBanNo); + List records = page.getRecords(); + if (CollectionUtil.isNotEmpty(records)) { + for (IpRegionLimitRecordAdminVo record : records) { + String deviceIdStr = record.getDeviceIdStr(); + if (StrUtil.isNotEmpty(deviceIdStr)) { + record.setDeviceIds(JSONObject.parseArray(deviceIdStr, String.class)); + } + } + } + return page; } @Override diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionLimitRecordAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionLimitRecordAdminMapper.xml index 2452d0d35..962983eb4 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionLimitRecordAdminMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionLimitRecordAdminMapper.xml @@ -6,7 +6,7 @@ irlr.uid, irlr.phone, irlr.create_time as createTime, - irlr.device_ids, + irlr.device_ids as deviceIdStr, irlr.last_check_time as lastCheckTime, irlr.last_check_ip_region as lastCheckIpRegion, a.sign_time as signTime, diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionWhiteAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionWhiteAdminMapper.xml index 2d9d7cee4..8ee2dc3ad 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionWhiteAdminMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionWhiteAdminMapper.xml @@ -5,6 +5,7 @@ select irw.id, irw.uid, + irw.phone, irw.create_time as createTime, irw.last_check_time as lastCheckTime, irw.source, diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ip/IpRegionLimitRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ip/IpRegionLimitRecord.java index 0eac0218f..189fd81e2 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ip/IpRegionLimitRecord.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ip/IpRegionLimitRecord.java @@ -4,7 +4,6 @@ import com.accompany.core.mybatis.typehandler.StringListTypeHandler; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +12,6 @@ import java.util.Date; import java.util.List; @Data -@TableName(value = "ip_region_limit_record", autoResultMap = true) public class IpRegionLimitRecord { @TableId(type = IdType.NONE) @@ -44,7 +42,7 @@ public class IpRegionLimitRecord { * 访问设备 */ @ApiModelProperty("访问设备") - @TableField(value = "device_ids", typeHandler = StringListTypeHandler.class) + @TableField(typeHandler = StringListTypeHandler.class) private List deviceIds; }