ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -33,7 +33,6 @@ @GetMapping("/query") @ApiOperation(value = "查询") @LogSave(operationType = "日志管理", contain = "查询日志信息") public CommonResult searchLog(LogQueryParams logQueryParams) { return CommonResult.success(iAdminLoginLogService.pageList(logQueryParams)); } ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; import java.util.Date; @Data @@ -20,7 +21,7 @@ private String adminId; @ExcelProperty(index = 0, value = "日志时间", format = "YYYY-mm-dd HH:mm:ss") private Date createTime; private LocalDateTime createTime; @ExcelProperty(index = 4, value = "IP地址") private String ip; ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
@@ -6,13 +6,10 @@ import com.ycl.entity.user.UmsAdminLoginLog; import com.ycl.entity.user.vo.UmsAdminLogVO; import java.util.List; /** * <p> * 后台用户登录日志表 Mapper 接口 * </p> * */ public interface UmsAdminLoginLogMapper extends BaseMapper<UmsAdminLoginLog> { Page<UmsAdminLogVO> selectByCondition(Page<UmsAdminLogVO> umsAdminLogVOPage, LogQueryParams logQueryParams); ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
@@ -13,7 +13,8 @@ </resultMap> <select id="selectByCondition" parameterType="com.ycl.dto.log.LogQueryParams" resultType="com.ycl.entity.user.vo.UmsAdminLogVO"> SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 left join ums_admin t2 on t1.admin_id=t2.id SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 left join ums_admin t2 on t1.admin_id=t2.id <where> <if test="logQueryParams.content!='' and logQueryParams.content!=null"> contain LIKE CONCAT('%',#{logQueryParams.content},'%') @@ -24,10 +25,10 @@ <if test="logQueryParams.portEquipment!='' and logQueryParams.portEquipment!=null"> and user_agent=#{logQueryParams.portEquipment} </if> <if test="logQueryParams.id!=null"> <if test="logQueryParams.id != null"> and admin_id=#{logQueryParams.id} </if> <if test="logQueryParams.startTime!='' and logQueryParams.endTime!=''"> <if test="logQueryParams.startTime != '' and logQueryParams.endTime !='' and logQueryParams.startTime !=null and logQueryParams.endTime!=null "> and create_time BETWEEN #{logQueryParams.startTime} AND #{logQueryParams.endTime} </if> </where>