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 98dcfd7..f355b4b 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 @@ -6,6 +6,7 @@ import com.mongodb.Block; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; +import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.bson.conversions.Bson; import org.springframework.data.mongodb.core.MongoOperations; @@ -14,6 +15,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.regex.Pattern; /** @@ -248,6 +250,25 @@ public class BsonPackTool { } /** + * 查询方位分装 + * @param columnName 列名称 + * @param bson + * @param startTime 开始值 + * @param endTime 结束之 + * @return + */ + public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) { + if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){ + bson = Filters.and( + bson, + Filters.gte(columnName, startTime), //大于等于开始日期 + Filters.lte(columnName, endTime) //小于等于结束日期 + ); + } + return bson; + } + + /** * 大于日期 * @param dateTime 日期 * @param columnName HQL里对应的时间字段 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index 2a28c0f..c29a77b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -70,7 +70,7 @@ public class TemplateModel implements Serializable { private List> rows; @ApiParam(value = "跨服务调用解析后数据") - private Object option; + private String option; @ApiParam(value = "分页参数") private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 51447d5..5d81ed5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -91,4 +91,5 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; + }