ruoyi
/
cloud-server
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():修复在转换工程过程中丢失infoId的情况

boot3.0
dongzeliang 2025-02-26 16:31:36 +08:00
parent 1c2aee8e08
commit 44a9e29996
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java
View File

@ -1,5 +1,7 @@
package com.muyu.common.system.domain; package com.muyu.common.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.annotation.Excel.ColumnType;
@ -26,6 +28,7 @@ public class SysLogininfor {
* ID * ID
*/ */
@Excel(name = "序号", cellType = ColumnType.NUMERIC) @Excel(name = "序号", cellType = ColumnType.NUMERIC)
@TableId(type = IdType.AUTO)
private Long infoId; private Long infoId;
/** /**

2
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java
View File

@ -13,6 +13,7 @@ import java.util.Date;
/** /**
* 用户登录日志查询模型对象 * 用户登录日志查询模型对象
* @author dongzeliang
*/ */
@Data @Data
@SuperBuilder @SuperBuilder
@ -70,6 +71,7 @@ public class SysLogininforListModel extends QueryModel<SysLogininforListModel> {
public static SysLogininforListModel buildSysLogininforListModel(SysLogininfor sysLogininfor) { public static SysLogininforListModel buildSysLogininforListModel(SysLogininfor sysLogininfor) {
return SysLogininforListModel.builder() return SysLogininforListModel.builder()
.infoId(sysLogininfor.getInfoId())
.ipaddr(sysLogininfor.getIpaddr()) .ipaddr(sysLogininfor.getIpaddr())
.userName(sysLogininfor.getUserName()) .userName(sysLogininfor.getUserName())
.status(sysLogininfor.getStatus()) .status(sysLogininfor.getStatus())

2
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java
View File

@ -55,7 +55,7 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
.eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus()) .eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus())
.like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName()) .like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName())
.between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime())); .between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime()));
return new PageQueryModel<SysLogininforListModel>(){{ return new PageQueryModel<>(){{
setDataList(page.getRecords().stream() setDataList(page.getRecords().stream()
.map(SysLogininforListModel::buildSysLogininforListModel) .map(SysLogininforListModel::buildSysLogininforListModel)
.toList()); .toList());