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 607427d..98dcfd7 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 @@ -109,7 +109,6 @@ public class BsonPackTool { return list; } - /** * 封装日期 * @param startDate 开始日期 @@ -161,7 +160,7 @@ public class BsonPackTool { * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 * @param isShowTime 是否包含时分秒 */ - public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { + public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) { if(date != null && !"null".equals(date) && date.trim().length() > 0){ date = getSafeParam(date); @@ -249,6 +248,68 @@ public class BsonPackTool { } /** + * 大于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "1900-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime && dateTime.trim().length()<=11) { + dateTime+= " 00:00:00"; + } + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + } + + return bson; + } + + /** + * 小于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "2100-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime&& dateTime.trim().length()<=11) { + dateTime+= " 23:59:59"; + } + if(bson == null) { + bson = Filters.and( + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + } + + return bson; + } + + /** * 封装String对象成like语句 * @param str 对象值 * @param columnName 列名 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java index f0fb196..21f56a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java @@ -50,6 +50,15 @@ public interface BaseRedis { Object getObject(Object key); /** + * 普通缓存获取 + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return 值 + */ + Object getObject(Object key, long start, long end); + + /** * 普通缓存放入 * @param key 键 * @param value 值 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 81adc82..1a6f01a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -55,7 +56,8 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; - @Column(name="resource_value",columnDefinition="TEXT") + @Lob + @Column(name="resource_value") @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; 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 c4bedb4..9e7722d 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -19,82 +20,97 @@ public class CoreBsonPack { /** * 日志复杂查询 + * * @param logSystem * @return */ - public static Bson packBsonByLogSystem(SysLogSystem logSystem){ + public static Bson packBsonByLogSystem(SysLogSystem logSystem) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson); - bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); + bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); return bson; } /** * 系统操作日志 + * * @param logOperate * @return */ - public static Bson packBsonByLogOperate(SysLogOperate logOperate){ + public static Bson packBsonByLogOperate(SysLogOperate logOperate) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson); - bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); + bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); return bson; } /** * 系统异常日志复杂查询 + * * @param sysLogException * @return */ - public static Bson packBsonBySysLogException(SysLogException sysLogException){ + public static Bson packBsonBySysLogException(SysLogException sysLogException) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson); - bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); + bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); + bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); return bson; } /** * 定时任务日志复杂查询 + * * @param sysLogTaskTime * @return */ - public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){ + 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); + 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; } /** * 区间 + * * @param colName * @param min * @param max * @return */ - public static Bson packBsonByInterval(String colName,Object min,Object max){ + public static Bson packBsonByInterval(String colName, Object min, Object max) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumBiggerPack(min,colName,bson); - bson = BsonPackTool.getNumSmallerPack(max,colName,bson); + bson = BsonPackTool.getNumBiggerPack(min, colName, bson); + bson = BsonPackTool.getNumSmallerPack(max, colName, bson); return bson; - }} + } + + /** + * 指定日期之后 + * @param dateTime 日期 + * @return + */ + public static Bson packBsonByDateTimeAfter(String dateTime){ + return BsonPackTool.timeLess(dateTime, "createDatetime", null, true); + } +}