Merge branch 'dev' into pre-production

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<IPage<FactoryNodePushEntity>> pageNodePush(FactoryNodePushEntity vo, Query query) {
+	public R<IPage<FactoryNodePushEntity>> pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) {
 		IPage<FactoryNodePushEntity> pages = nodePushService.pageNodePush(vo, query);
 		return R.data(pages);
 

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;
+
+}

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<FactoryNodePushEntity> {
 
-	IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, Query query);
+	IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query);
 
 	Boolean cancel(List<String> id);
 

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<FactoryNodePushMapper, FactoryNodePushEntity> implements FactoryNodePushService {
 
     @Override
-    public IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, Query query) {
+    public IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, FactoryNodePushQuery query) {
 		IPage<FactoryNodePushEntity> page = Condition.getPage(query);
 		QueryWrapper<FactoryNodePushEntity> queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class);
 		if(StrUtil.isNotEmpty(vo.getType())){
@@ -46,10 +46,22 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 		if(StrUtil.isNotEmpty(vo.getSendStatus())){
 			queryWrapper.eq("send_status", vo.getSendStatus());
 		}
+		customQuery(query, queryWrapper);
 		List<FactoryNodePushEntity> deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper);
 		return page.setRecords(deliveryTrainPage);
     }
 
+	private void customQuery(FactoryNodePushQuery query, QueryWrapper<FactoryNodePushEntity> 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<String> ids) {
 		if(CollUtil.isEmpty(ids)){

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);
+		}
+	}
+
 }