From 63e00732e3f46a56d9ffe5149bdba4a1a82f8c95 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 11 Aug 2022 11:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/impl/SystemLogsServerImpl.java | 2 +- .../hxkj/common/core/basics/IBaseMapper.java | 34 ++++++++----------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java index d2e9fddb..687c9a4b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogsServerImpl.java @@ -62,7 +62,7 @@ public class SystemLogsServerImpl implements ISystemLogsServer { "=:status:int", "=:url:str", "=:ip:str", - "datetime:startTime-endTime@create_time:str" + "datetime:startTime-endTime@t.create_time:str" }); IPage iPage = logOperateMapper.selectJoinPage( diff --git a/server/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java b/server/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java index 675c8210..9bf4f61f 100644 --- a/server/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java @@ -155,16 +155,14 @@ public interface IBaseMapper extends MPJBaseMapper { break; case "datetime": String[] dateKeys = key.split("-"); - String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); - if (dateStart.equals("")) { - continue; - } - String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : ""; + String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); + String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : ""; + if (type.equals("long")) { 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 { - queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); + if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); } if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); } } break; @@ -291,19 +289,17 @@ public interface IBaseMapper extends MPJBaseMapper { queryWrapper.notIn(field, val); break; case "datetime": - String[] dateKeys = key.split("-"); - String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); - if (dateStart.equals("")) { - continue; + String[] dateKeys = key.split("-"); + String dateStart = params.getOrDefault(dateKeys[0].trim(), ""); + String dateEnd = dateKeys.length > 1 ? params.getOrDefault(dateKeys[1].trim(), "") : ""; + + 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; } }