From bfa69def8c13d0bfb3e2f2276568669bb3d11320 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 26 Jul 2024 15:25:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mengtian/controller/OrderController.java | 4 +-- .../mengtian/query/FactoryNodePushQuery.java | 32 +++++++++++++++++++ .../service/FactoryNodePushService.java | 4 +-- .../impl/FactoryNodePushServiceImpl.java | 16 ++++++++-- .../factorydata/mengtian/util/QueryUtil.java | 28 ++++++++++++++++ 5 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java index eaba9ef43..438b181ed 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/controller/OrderController.java @@ -4,13 +4,13 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import com.logpm.factorydata.mengtian.service.FactoryNodePushService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.factorydata.FactoryDataConstants; -import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -54,7 +54,7 @@ public class OrderController { @GetMapping @ApiOperationSupport(order = 2) @ApiOperation(value = "推送记录", notes = "推送记录") - public R> pageNodePush(FactoryNodePushEntity vo, Query query) { + public R> pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) { IPage pages = nodePushService.pageNodePush(vo, query); return R.data(pages); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java new file mode 100644 index 000000000..4b4a81a98 --- /dev/null +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/query/FactoryNodePushQuery.java @@ -0,0 +1,32 @@ +package com.logpm.factorydata.mengtian.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.Query; + +import java.util.Date; + +/** + * 节点数据推送成功数据查询对象 query + * + * @author zhaoqiaobo + * @create 2024-03-13 14:21 + */ +@ApiModel(value = "节点数据推送成功数据查询对象", description = "节点数据推送成功数据查询对象") +@Data +public class FactoryNodePushQuery extends Query { + + @ApiModelProperty(value = "创建时间开始（范围）", position = 1) + private Date startCreateTime; + + @ApiModelProperty(value = "创建时间结束（范围）", position = 2) + private Date endCreateTime; + + @ApiModelProperty(value = "修改时间开始（范围）", position = 3) + private Date startUpdateTime; + + @ApiModelProperty(value = "修改时间结束（范围）", position = 4) + private Date endUpdateTime; + +} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java index eccc14c7a..1cc101fbf 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/FactoryNodePushService.java @@ -2,8 +2,8 @@ package com.logpm.factorydata.mengtian.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.support.Query; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; **/ public interface FactoryNodePushService extends BaseService { - IPage pageNodePush(FactoryNodePushEntity vo, Query query); + IPage pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query); Boolean cancel(List id); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java index 8047d8bc1..444acd26d 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity; import com.logpm.factorydata.mengtian.mapper.FactoryNodePushMapper; +import com.logpm.factorydata.mengtian.query.FactoryNodePushQuery; import com.logpm.factorydata.mengtian.service.FactoryNodePushService; import com.logpm.factorydata.mengtian.util.QueryUtil; import lombok.AllArgsConstructor; @@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; import org.springframework.stereotype.Service; import java.util.List; @@ -37,7 +37,7 @@ import java.util.List; public class FactoryNodePushServiceImpl extends BaseServiceImpl implements FactoryNodePushService { @Override - public IPage pageNodePush(FactoryNodePushEntity vo, Query query) { + public IPage pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) { IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class); if(StrUtil.isNotEmpty(vo.getType())){ @@ -46,10 +46,22 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper); return page.setRecords(deliveryTrainPage); } + private void customQuery(FactoryNodePushQuery query, QueryWrapper queryWrapper) { + // 配送时间开始 + QueryUtil.timeGe("create_time", query.getStartCreateTime(), queryWrapper); + // 配送时间结束 + QueryUtil.timeLe("create_time", query.getEndCreateTime(), queryWrapper); + // 配送时间开始 + QueryUtil.timeGe("update_time", query.getStartUpdateTime(), queryWrapper); + // 配送时间结束 + QueryUtil.timeLe("update_time", query.getEndUpdateTime(), queryWrapper); + } + @Override public Boolean cancel(List ids) { if(CollUtil.isEmpty(ids)){ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java index d366260d3..bfecd3ca6 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/util/QueryUtil.java @@ -1,9 +1,11 @@ package com.logpm.factorydata.mengtian.util; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springblade.core.mp.support.Condition; +import java.util.Date; import java.util.Map; /** @@ -26,4 +28,30 @@ public class QueryUtil { return Condition.getQueryWrapper(stringObjectMap, classz); } + /** + * QueryWrapper 查询大于指定时间范围 + * + * @param field 字段名 + * @param value 时间值 + * @param wrapper mybatisplus查询对象 + */ + public static void timeGe(String field, Date value, QueryWrapper wrapper) { + if (ObjectUtil.isNotEmpty(value)) { + wrapper.ge(field, value); + } + } + + /** + * QueryWrapper 查询小于指定时间范围 + * + * @param field 字段名 + * @param value 时间值 + * @param wrapper mybatisplus查询对象 + */ + public static void timeLe(String field, Date value, QueryWrapper wrapper) { + if (ObjectUtil.isNotEmpty(value)) { + wrapper.le(field, value); + } + } + }