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

修复日志搜索错误

This commit is contained in:
TinyAnts 2022-08-11 11:28:31 +08:00
parent f8490c1990
commit 63e00732e3
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java
View File

@ -62,7 +62,7 @@ public class SystemLogsServerImpl implements ISystemLogsServer {
"=:status:int", "=:status:int",
"=:url:str", "=:url:str",
"=:ip:str", "=:ip:str",
"datetime:startTime-endTime@create_time:str" "datetime:startTime-endTime@t.create_time:str"
}); });
IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage( IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage(

34
server/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java
View File

@ -155,16 +155,14 @@ public interface IBaseMapper<T> extends MPJBaseMapper<T> {
break; break;
case "datetime": case "datetime":
String[] dateKeys = key.split("-"); String[] dateKeys = key.split("-");
String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); String dateStart = params.getOrDefault(dateKeys[0].trim(), "");
if (dateStart.equals("")) { String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : "";
continue;
}
String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : "";
if (type.equals("long")) { if (type.equals("long")) {
if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); } if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); }
queryWrapper.ge(field, Long.parseLong(dateStart)); if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); };
} else { } else {
queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); } if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); }
} }
break; break;
@ -291,19 +289,17 @@ public interface IBaseMapper<T> extends MPJBaseMapper<T> {
queryWrapper.notIn(field, val); queryWrapper.notIn(field, val);
break; break;
case "datetime": case "datetime":
String[] dateKeys = key.split("-"); String[] dateKeys = key.split("-");
String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); String dateStart = params.getOrDefault(dateKeys[0].trim(), "");
if (dateStart.equals("")) { String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : "";
continue;
if (type.equals("long")) {
if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); }
if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); }
} else {
if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); };
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); }
} }
String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : "";
if (type.equals("long")) {
queryWrapper.ge(field, Long.parseLong(dateStart));
if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); }
} else {
queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart));
if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); }
}
break; break;
} }
} }