Move table t_sys_log to sqlite
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package top.fatweb.api.service.permission.impl
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem
|
||||
import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.kotlin.KtUpdateWrapper
|
||||
@@ -47,6 +48,7 @@ import java.time.ZoneOffset
|
||||
* @see User
|
||||
* @see IUserService
|
||||
*/
|
||||
@DS("master")
|
||||
@Service
|
||||
class UserServiceImpl(
|
||||
private val passwordEncoder: PasswordEncoder,
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package top.fatweb.api.service.system
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage
|
||||
import com.baomidou.mybatisplus.extension.service.IService
|
||||
import top.fatweb.api.entity.system.SysLog
|
||||
import top.fatweb.api.param.system.SysLogGetParam
|
||||
import top.fatweb.api.vo.PageVo
|
||||
import top.fatweb.api.vo.system.SysLogVo
|
||||
|
||||
/**
|
||||
* System log service interface
|
||||
@@ -22,8 +23,8 @@ interface ISysLogService : IService<SysLog> {
|
||||
* @author FatttSnake, fatttsnake@gmail.com
|
||||
* @since 1.0.0
|
||||
* @see SysLogGetParam
|
||||
* @see IPage
|
||||
* @see SysLog
|
||||
* @see PageVo
|
||||
* @see SysLogVo
|
||||
*/
|
||||
fun getPage(sysLogGetParam: SysLogGetParam?): IPage<SysLog>
|
||||
fun getPage(sysLogGetParam: SysLogGetParam?): PageVo<SysLogVo>
|
||||
}
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
package top.fatweb.api.service.system.impl
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage
|
||||
import com.baomidou.dynamic.datasource.annotation.DS
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.springframework.stereotype.Service
|
||||
import top.fatweb.api.converter.system.SysLogConverter
|
||||
import top.fatweb.api.entity.system.SysLog
|
||||
import top.fatweb.api.mapper.system.SysLogMapper
|
||||
import top.fatweb.api.param.system.SysLogGetParam
|
||||
import top.fatweb.api.service.permission.IUserService
|
||||
import top.fatweb.api.service.system.ISysLogService
|
||||
import top.fatweb.api.util.PageUtil
|
||||
import top.fatweb.api.vo.PageVo
|
||||
import top.fatweb.api.vo.system.SysLogVo
|
||||
|
||||
/**
|
||||
* System log service implement
|
||||
@@ -21,21 +25,29 @@ import top.fatweb.api.util.PageUtil
|
||||
* @see SysLog
|
||||
* @see ISysLogService
|
||||
*/
|
||||
@DS("sqlite")
|
||||
@Service
|
||||
class SysLogServiceImpl : ServiceImpl<SysLogMapper, SysLog>(), ISysLogService {
|
||||
override fun getPage(sysLogGetParam: SysLogGetParam?): IPage<SysLog> {
|
||||
class SysLogServiceImpl(
|
||||
private val userService: IUserService
|
||||
) : ServiceImpl<SysLogMapper, SysLog>(), ISysLogService {
|
||||
override fun getPage(sysLogGetParam: SysLogGetParam?): PageVo<SysLogVo> {
|
||||
val sysLogPage = Page<SysLog>(sysLogGetParam?.currentPage ?: 1, sysLogGetParam?.pageSize ?: 20)
|
||||
|
||||
PageUtil.setPageSort(sysLogGetParam, sysLogPage, OrderItem.desc("start_time"))
|
||||
|
||||
return baseMapper.selectPage(
|
||||
val sysLogIPage = baseMapper.selectPage(
|
||||
sysLogPage,
|
||||
sysLogGetParam?.logType?.split(","),
|
||||
sysLogGetParam?.requestMethod?.split(","),
|
||||
sysLogGetParam?.searchRequestUrl,
|
||||
sysLogGetParam?.searchRegex ?: false,
|
||||
sysLogGetParam?.searchStartTime,
|
||||
sysLogGetParam?.searchEndTime
|
||||
)
|
||||
sysLogIPage.records.forEach {
|
||||
it.operateUsername =
|
||||
it.operateUserId?.let { it1 -> userService.getOne(it1)?.username }
|
||||
}
|
||||
|
||||
return SysLogConverter.sysLogPageToSysLogPageVo(sysLogIPage)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user