From 02e31b07c8b14d72f879c5824d7380ab09cd006b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 4 Jan 2019 19:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=AE=8C=E6=88=90=20=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java | 2 +- .../estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 3de28d8..607427d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -162,7 +162,7 @@ public class BsonPackTool { * @param isShowTime 是否包含时分秒 */ public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { - if(date != null && date.trim().length() > 0){ + if(date != null && !"null".equals(date) && date.trim().length() > 0){ date = getSafeParam(date); String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 0aa94fb..59f7c19 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; @@ -66,4 +67,19 @@ public class CoreBsonPack { return bson; } + + /** + * 定时任务日志复杂查询 + * @param sysLogTaskTime + * @return + */ + public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){ + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson); + bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false); + + return bson; + } }