moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复字段返回

Browse Source
This commit is contained in:
liaozetao
2023-11-22 15:20:22 +08:00
committed by khalil
parent 54b6d56712
commit 54ea1cd490
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ip/IpRegionLimitRecordAdminVo.java
View File

@@ -48,4 +48,10 @@ public class IpRegionLimitRecordAdminVo extends IpRegionLimitRecord {
@ApiModelProperty("邀请码")
private String inviteCode;
/**
* 多个设备
*/
@ApiModelProperty("多个设备")
private String deviceIdStr;
}

16
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java
View File

@@ -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<IpRegionLimitRecordAdminVo> page(String userErBanNo, Integer currentPage, Integer pageSize) {
return ipRegionLimitRecordAdminMapper.page(new Page<>(currentPage, pageSize), userErBanNo);
Page<IpRegionLimitRecordAdminVo> page = ipRegionLimitRecordAdminMapper.page(new Page<>(currentPage, pageSize), userErBanNo);
List<IpRegionLimitRecordAdminVo> 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

2
accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionLimitRecordAdminMapper.xml
View File

@@ -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,

1
accompany-admin/accompany-admin-service/src/main/resources/mapper/IpRegionWhiteAdminMapper.xml
View File

@@ -5,6 +5,7 @@
select
irw.id,
irw.uid,
irw.phone,
irw.create_time as createTime,
irw.last_check_time as lastCheckTime,
irw.source,

4
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/ip/IpRegionLimitRecord.java
View File

@@ -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<String> deviceIds;
}