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

邮箱-登录记录

Browse Source
This commit is contained in:
khalil
2025-03-17 11:18:20 +08:00
parent b051cf34cd
commit db68076660
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordAdminService.java
View File

@@ -30,7 +30,7 @@ public class AccountLoginRecordAdminService extends BaseService {
private AccountLoginRecordMapper accountLoginRecordMapper;
public Page<AccountLoginRecordAdminVo> getAccountLoginRecordList(Integer pageSize, Integer pageNum,
Long erbanNo, String phone,
Long erbanNo, String phone, String email,
Integer loginType, String deviceId,
String ip, String ipRegion) {
Page<AccountLoginRecordAdminVo> voPageInfo = new Page<>(pageNum, pageSize);
@@ -48,7 +48,8 @@ public class AccountLoginRecordAdminService extends BaseService {
LambdaQueryWrapper<AccountLoginRecord> queryWrapper = Wrappers.<AccountLoginRecord>lambdaQuery()
.eq(null != uid, AccountLoginRecord::getUid, uid)
.eq(StringUtils.isNotBlank(deviceId), AccountLoginRecord::getDeviceId, deviceId)
.eq(StringUtils.isNotBlank(phone), AccountLoginRecord::getPhone, deviceId)
.eq(StringUtils.isNotBlank(phone), AccountLoginRecord::getPhone, phone)
.eq(StringUtils.isNotBlank(email), AccountLoginRecord::getEmail, email)
.eq(null != loginType, AccountLoginRecord::getLoginType, loginType)
.likeRight(StringUtils.isNotBlank(ip), AccountLoginRecord::getLoginIp, ip)
.like(StringUtils.isNotBlank(ipRegion), AccountLoginRecord::getLoginIpRegion, ipRegion)

8
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordAdminController.java
View File

@@ -29,17 +29,17 @@ public class AccountLoginRecordAdminController extends BaseController {
*/
@GetMapping(value = "/list")
public PageResult<AccountLoginRecordAdminVo> getAccountBlockList(Integer pageSize, Integer pageNum,
String phone, Long erbanNo, Integer loginType,
Long erbanNo, Integer loginType, String phone, String email,
String deviceId, String ip, String ipRegion){
Page<AccountLoginRecordAdminVo> pageInfo = accountLoginRecordService.getAccountLoginRecordList(pageSize,pageNum,
erbanNo, phone, loginType, deviceId, ip, ipRegion);
erbanNo, phone, email, loginType, deviceId, ip, ipRegion);
return new PageResult<>(pageInfo);
}
@SneakyThrows
@RequestMapping("/export")
public void export(HttpServletResponse response,
String phone, Long erbanNo, Integer loginType,
Long erbanNo, Integer loginType, String phone, String email,
String deviceId, String ip, String ipRegion) {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
@@ -47,7 +47,7 @@ public class AccountLoginRecordAdminController extends BaseController {
String excelName = URLEncoder.encode("登录记录", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
Page<AccountLoginRecordAdminVo> pageInfo = accountLoginRecordService.getAccountLoginRecordList(-1, -1,
erbanNo, phone, loginType, deviceId, ip, ipRegion);
erbanNo, phone, email, loginType, deviceId, ip, ipRegion);
EasyExcel.write(response.getOutputStream(), AccountLoginRecordAdminVo.class).sheet("登录记录").doWrite(pageInfo.getRecords());
}

2
accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java
View File

@@ -14,6 +14,8 @@ public class AccountLoginRecord {
private String phone;
private String email;
private Byte loginType;
private String loginIp;

1
accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
View File

@@ -245,6 +245,7 @@ public class MyUserDetailsServiceImpl implements MyUserDetailsService {
accountLoginRecord.setLoginType(loginType);
accountLoginRecord.setDeviceId(deviceInfo.getDeviceId());
accountLoginRecord.setPhone(account.getPhone());
accountLoginRecord.setEmail(account.getEmail());
accountLoginRecord.setApp(account.getApp());
accountLoginRecord.setAppVersion(deviceInfo.getAppVersion());
accountLoginRecord.setIspType(deviceInfo.getIspType());