mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复日志搜索bug

This commit is contained in:
TinyAnts 2022-04-15 11:43:36 +08:00
parent 860dff2f92
commit 8a763d2ac6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java
View File

@ -45,6 +45,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
*/ */
@Override @Override
public PageResult<LogOperateVo> operate(PageParam pageParam, Map<String, String> params) { public PageResult<LogOperateVo> operate(PageParam pageParam, Map<String, String> params) {
Integer pageNo = pageParam.getPageNo(); Integer pageNo = pageParam.getPageNo();
Integer pageSize = pageParam.getPageSize(); Integer pageSize = pageParam.getPageSize();
@ -54,21 +55,21 @@ public class SystemLogServerImpl implements ISystemLogServer {
.leftJoin("ls_system_admin sa ON sa.id=t.admin_id") .leftJoin("ls_system_admin sa ON sa.id=t.admin_id")
.orderByDesc("id"); .orderByDesc("id");
IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage(
new Page<>(pageNo, pageSize),
LogOperateVo.class,
mpjQueryWrapper);
logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{ logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{
"like:title:str", "like:title:str",
"like:username:str", "like:username:str",
"=:type:int", "=:type:str",
"=:status:int", "=:status:int",
"=:url:str", "=:url:str",
"=:ip:str", "=:ip:str",
"datetime:startTime-endTime@create_time:str" "datetime:startTime-endTime@create_time:str"
}); });
IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage(
new Page<>(pageNo, pageSize),
LogOperateVo.class,
mpjQueryWrapper);
for (LogOperateVo vo : iPage.getRecords()) { for (LogOperateVo vo : iPage.getRecords()) {
vo.setTaskTime(vo.getTaskTime()); vo.setTaskTime(vo.getTaskTime());
vo.setStartTime(TimeUtil.timestampToDate(vo.getStartTime())); vo.setStartTime(TimeUtil.timestampToDate(vo.getStartTime()));
@ -112,8 +113,6 @@ public class SystemLogServerImpl implements ISystemLogServer {
voList.add(vo); voList.add(vo);
} }
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), voList); return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), voList);
} }

4
like-framework/like-admin/src/main/resources/application.yml
View File

@ -50,8 +50,8 @@ spring:
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径 mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径
typeAliasesPackage: com.hxkj.**.mapper typeAliasesPackage: com.hxkj.**.mapper
# configuration: configuration:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config: global-config:
banner: false banner: false
db-config: db-config: