feat(all): 修改报表查询方式，提升查询效率

blade-service/logpm-report/src/main/java/com/logpm/report/dto/DeliveryTrainLoadedScanDTO.java

@@ -0,0 +1,19 @@
+package com.logpm.report.dto;
+
+import lombok.Data;
+
+/**
+ * 配送车次报表扫描装车
+ * @Author: zqb
+ * @Date: 2024/6/13
+ */
+@Data
+public class DeliveryTrainLoadedScanDTO {
+
+	private Long  deliveryId;
+	private String loadedNum;
+	private String reNum;
+	private String exLoadedNum;
+	private String exReNum;
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.DeliveryTrainLoadedScanDTO;
 import com.logpm.report.vo.ReportCustomerVO;
 import com.logpm.report.vo.ReportDetailVO;
 import com.logpm.report.vo.ReportDevilerVO;
@@ -64,4 +65,8 @@ public interface ReportDeliverMapeer extends BaseMapper {
 	 */
 	List<ReportDetailVO> getDetailsZeroPage(IPage<ReportDetailVO> page,@Param("ew") QueryWrapper<ReportDetailVO> queryWrapper);
 	Long getDetailsZeroPageCount(@Param("ew") QueryWrapper<ReportDetailVO> queryWrapper);
+
+	List<DeliveryTrainLoadedScanDTO> getDeliveryTrainLoadSacnByIds(@Param("idBatch") List<Long> idBatch);
+
+	List<DeliveryTrainLoadedScanDTO> getDeliveryTrainLoadSacnInvnByIds(@Param("idBatch") List<Long> idBatch);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -3,6 +3,90 @@
 <mapper namespace="com.logpm.report.mapper.ReportDeliverMapeer">
 
     <select id="getDeliveryTrainPage" resultType="com.logpm.report.vo.ReportDevilerVO">
+        select id,
+               train_number,
+               task_time,
+               warehouse_name,
+               warehouse_id,
+               type,
+               kind,
+               vehicle_name,
+               driver_name,
+               distribution_company,
+               delivery_status,
+               customers_number,
+               price,
+               order_number,
+               reservation_num,
+               reservation_stock_listNum,
+               ds_num,
+               ss_num,
+               unloading_team_name
+        from (select d.id,
+                     d.train_number                    train_number,
+                     d.task_time                       task_time,
+                     d.warehouse_name                  warehouse_name,
+                     d.warehouse_id                    warehouse_id,
+                     CASE
+                         WHEN d.type = 1 THEN
+                             '商配'
+                         WHEN d.type = 2 THEN
+                             '市配'
+                         ELSE ''
+                         END                           type,
+                     CASE
+                         WHEN d.kind = 1 THEN
+                             '自主配送'
+                         WHEN d.kind = 2 THEN
+                             '自主配送'
+                         ELSE ''
+                         END                           kind,
+                     d.vehicle_name                    vehicle_name,
+                     d.driver_name                     driver_name,
+                     d.distribution_company            distribution_company,
+                     CASE
+                         WHEN d.delivery_status = 1 THEN
+                             '待配送'
+                         WHEN d.delivery_status = 2 THEN
+                             '配送中'
+                         WHEN d.delivery_status = 3 THEN
+                             '已完成'
+                         ELSE ''
+                         END                           delivery_status,
+                     d.customers_number                customers_number,
+                     d.price,
+                     d.order_number                    order_number,
+                     rn.num                            reservation_num,
+                     rn.stnum                          reservation_stock_listNum,
+                     ifnull(rn.dsNum, 0)               ds_num,
+                     ifnull(rn.ssNum, 0)               ss_num,
+                     ifnull(d.unloading_team_name, '') unloading_team_name
+              from logpm_distribution_delivery_list d
+                       LEFT JOIN (SELECT lds.delivery_id,
+                                         COALESCE(sum(ldr1.reservation_num), 0)            num,
+                                         COALESCE(sum(ldr1.reservation_stock_list_num), 0) stnum,
+                                         SUM(CASE
+                                                 WHEN lds.driver_signing = 2 THEN
+                                                     1
+                                                 ELSE
+                                                     0
+                                             END)                                          dsNum,
+                                         SUM(CASE
+                                                 WHEN lds.signing_status = 2 THEN
+                                                     1
+                                                 ELSE
+                                                     0
+                                             END)                                          ssNum
+                                  FROM logpm_distribution_signfor lds
+                                           left JOIN logpm_distribution_reservation ldr1 ON lds.reservation_id = ldr1.id
+                                  WHERE ldr1.reservation_status <![CDATA[<]]> '40'
+        GROUP BY lds.delivery_id
+        order by null) rn ON rn.delivery_id = d.id
+        where d.customers_number > 0
+        and rn.num > 0) t
+            ${ew.customSqlSegment}
+    </select>
+    <select id="getDeliveryTrainPage1" resultType="com.logpm.report.vo.ReportDevilerVO">
         select train_number,
                task_time,
                warehouse_name,
@@ -636,4 +720,49 @@
         ) t
     </select>
 
+    <select id="getDeliveryTrainLoadSacnByIds" resultType="com.logpm.report.dto.DeliveryTrainLoadedScanDTO">
+        select t.delivery_id,
+               SUM(t.loaded_nub)                        loaded_num,
+               sum(t.received_quantity)                 re_num,
+               sum(if(t.is_abnormal_loading = 1, 0, 1)) ex_loaded_num,
+               sum(if(t.is_abnormal_signing = 1, 0, 1)) ex_reNum
+        from logpm_distribution_loadscan t
+        where  exists(
+        select 1 from (
+        <foreach collection="idBatch" index="ind" item="item">
+            <if test="ind == 0">
+                select #{item} pid
+            </if>
+            <if test="ind != 0">
+                union all
+                select #{item} pid
+            </if>
+        </foreach>
+        ) packageCodes where packageCodes.pid = t.delivery_id)
+          and t.scan_status >1
+        group by t.delivery_id
+        order by null
+    </select>
+
+    <select id="getDeliveryTrainLoadSacnInvnByIds" resultType="com.logpm.report.dto.DeliveryTrainLoadedScanDTO">
+        select t.delivery_id,
+               SUM(t.loaded_nub)        loadedNum,
+               sum(t.received_quantity) reNum
+        from logpm_distribution_loadscaninvn t
+        where exists(
+        select 1 from (
+        <foreach collection="idBatch" index="ind" item="item">
+            <if test="ind == 0">
+                select #{item} pid
+            </if>
+            <if test="ind != 0">
+                union all
+                select #{item} pid
+            </if>
+        </foreach>
+        ) packageCodes where packageCodes.pid = t.delivery_id)
+          and  t.scan_status > 1
+        group by t.delivery_id
+        order by null
+    </select>
 </mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -1,8 +1,14 @@
 package com.logpm.report.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.report.dto.DeliveryTrainLoadedScanDTO;
 import com.logpm.report.mapper.ReportDeliverMapeer;
 import com.logpm.report.query.DevilerDetailsQuery;
 import com.logpm.report.query.ReportCustomerQuery;
@@ -13,6 +19,7 @@ import com.logpm.report.reader.DeliveryDetailReader;
 import com.logpm.report.reader.DeliveryTrainReader;
 import com.logpm.report.reader.StockOrderReader;
 import com.logpm.report.service.ReportDeliverService;
+import com.logpm.report.util.CheckDataUtil;
 import com.logpm.report.util.QueryUtil;
 import com.logpm.report.util.ReportExcelUtil;
 import com.logpm.report.vo.ReportCustomerVO;
@@ -20,11 +27,19 @@ import com.logpm.report.vo.ReportDetailVO;
 import com.logpm.report.vo.ReportDevilerVO;
 import com.logpm.report.vo.StockOrderVO;
 import lombok.AllArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 /**
  * @author zhaoqiaobo
@@ -39,14 +54,110 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	private final DeliveryCustomerReader deliveryCustomerReader;
 	private final DeliveryDetailReader deliveryDetailReader;
 	private final StockOrderReader stockOrderReader;
+	private final IBasicdataWarehouseClient warehouseClient;
 
 	@Override
 	public IPage<ReportDevilerVO> deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query) {
+		// 校验时间
+		dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime());
 		IPage<ReportDevilerVO> page = Condition.getPage(query);
 		QueryWrapper<ReportDevilerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDevilerVO.class);
 		// 自定义 sql 查询条件
 		trainCustomQuery(query, queryWrapper);
-		return page.setRecords(reportDeliverMapeer.getDeliveryTrainPage(page, queryWrapper));
+		// 用户仓库权限
+		// 1 如果用户页面选择了仓库，按选择的仓库查询。
+		// 2 用户页面没有选择仓库，但是切换了仓库，按切换的仓库查
+		// 3 用户没有选择仓库，也没有切换仓库，按用户当前所有仓查询
+		if (StrUtil.isEmpty(vo.getWarehouseName())) {
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
+				queryWrapper.eq("warehouse_id", myCurrentWarehouse.getId());
+			} else {
+				List<BasicdataWarehouseEntity> warehouseEntities = warehouseClient.getMyWarehouseList();
+				queryWrapper.in("warehouse_id", warehouseEntities.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+			}
+		}
+
+		List<ReportDevilerVO> deliveryTrainPage = reportDeliverMapeer.getDeliveryTrainPage(page, queryWrapper);
+		List<Long> ids = deliveryTrainPage.stream().map(ReportDevilerVO::getId).collect(Collectors.toList());
+		// 异步查询扫描装车和异常扫描装车数据
+		if (CollUtil.isNotEmpty(ids)) {
+			// 每5000个提交一次查询
+			List<List<Long>> partitionedIds = CollUtil.split(ids, 5000);
+			List<CompletableFuture<List<DeliveryTrainLoadedScanDTO>>> futures = new ArrayList<>();
+			for (List<Long> idBatch : partitionedIds) {
+				futures.add(getTrainLoadedScanFuture(idBatch, deliveryTrainPage));
+				futures.add(getTrainLoadedScanInvnFuture(idBatch, deliveryTrainPage));
+			}
+			try {
+				CompletableFuture<Void> allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+				allFutures.join();
+			} catch (Exception e) {
+
+			}
+		}
+		return page.setRecords(deliveryTrainPage);
+	}
+
+	private @NotNull CompletableFuture<List<DeliveryTrainLoadedScanDTO>> getTrainLoadedScanInvnFuture(List<Long> idBatch, List<ReportDevilerVO> deliveryTrainPage) {
+		CompletableFuture<List<DeliveryTrainLoadedScanDTO>> future = CompletableFuture.supplyAsync(() ->
+			reportDeliverMapeer.getDeliveryTrainLoadSacnInvnByIds(idBatch));
+		future.thenAccept(list -> {
+			if (CollUtil.isNotEmpty(list)) {
+				// list 封装为map deliveryId为key
+				Map<Long, DeliveryTrainLoadedScanDTO> loadedScanDTOMap = new HashMap<>();
+				list.forEach(dto -> loadedScanDTOMap.put(dto.getDeliveryId(), dto));
+				List<ReportDevilerVO> collect = deliveryTrainPage.stream().filter(reportDevilerVO -> idBatch.contains(reportDevilerVO.getId())).collect(Collectors.toList());
+				for (ReportDevilerVO reportDevilerVO : collect) {
+					if (loadedScanDTOMap.containsKey(reportDevilerVO.getId())) {
+						DeliveryTrainLoadedScanDTO dto = loadedScanDTOMap.get(reportDevilerVO.getId());
+						reportDevilerVO.setInvnLoadedNum(StrUtil.isNotEmpty(dto.getLoadedNum()) ? dto.getLoadedNum() : "0");
+						reportDevilerVO.setInvnReNum(StrUtil.isNotEmpty(dto.getReNum()) ? dto.getReNum() : "0");
+					} else {
+						reportDevilerVO.setInvnLoadedNum("0");
+						reportDevilerVO.setInvnReNum("0");
+					}
+				}
+			}
+		});
+		return future;
+	}
+
+	private @NotNull CompletableFuture<List<DeliveryTrainLoadedScanDTO>> getTrainLoadedScanFuture(List<Long> idBatch, List<ReportDevilerVO> deliveryTrainPage) {
+		CompletableFuture<List<DeliveryTrainLoadedScanDTO>> future = CompletableFuture.supplyAsync(() ->
+			reportDeliverMapeer.getDeliveryTrainLoadSacnByIds(idBatch));
+		future.thenAccept(list -> {
+			if (CollUtil.isNotEmpty(list)) {
+				// list 封装为map deliveryId为key
+				Map<Long, DeliveryTrainLoadedScanDTO> loadedScanDTOMap = new HashMap<>();
+				list.forEach(dto -> loadedScanDTOMap.put(dto.getDeliveryId(), dto));
+				List<ReportDevilerVO> collect = deliveryTrainPage.stream().filter(reportDevilerVO -> idBatch.contains(reportDevilerVO.getId())).collect(Collectors.toList());
+				for (ReportDevilerVO reportDevilerVO : collect) {
+					if (loadedScanDTOMap.containsKey(reportDevilerVO.getId())) {
+						DeliveryTrainLoadedScanDTO dto = loadedScanDTOMap.get(reportDevilerVO.getId());
+						reportDevilerVO.setLoadedNum(StrUtil.isNotEmpty(dto.getLoadedNum()) ? dto.getLoadedNum() : "0");
+						reportDevilerVO.setReNum(StrUtil.isNotEmpty(dto.getReNum()) ? dto.getReNum() : "0");
+						reportDevilerVO.setExLoadedNum(StrUtil.isNotEmpty(dto.getExLoadedNum()) ? dto.getExLoadedNum() : "0");
+						reportDevilerVO.setExReNum(StrUtil.isNotEmpty(dto.getExReNum()) ? dto.getExReNum() : "0");
+					} else {
+						reportDevilerVO.setLoadedNum("0");
+						reportDevilerVO.setReNum("0");
+						reportDevilerVO.setExLoadedNum("0");
+						reportDevilerVO.setExReNum("0");
+					}
+				}
+			}
+		});
+		return future;
+	}
+
+	private static void dateIsWithinOneMonth(String taskTime, Date startTaskTime, Date endTaskTime) {
+		if (ObjectUtil.isEmpty(taskTime)) {
+			boolean withinOneMonth = CheckDataUtil.isWithinOneMonth(startTaskTime, endTaskTime);
+			if (!withinOneMonth) {
+				throw new ServiceException("日期必选且日期只能选择一个月");
+			}
+		}
 	}
 
 	private void trainCustomQuery(ReportDevilerQuery query, QueryWrapper<ReportDevilerVO> queryWrapper) {
@@ -68,6 +179,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 
 	@Override
 	public void exportTrain(HttpServletResponse response, ReportDevilerVO vo, ReportDevilerQuery query) {
+		dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime());
 		QueryWrapper<ReportDevilerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDevilerVO.class);
 		trainCustomQuery(query, queryWrapper);
 		new ReportExcelUtil().export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表");

blade-service/logpm-report/src/main/java/com/logpm/report/util/CheckDataUtil.java

@@ -0,0 +1,41 @@
+package com.logpm.report.util;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+
+import java.util.Date;
+
+/**
+ * 数据校验工具类
+ *
+ * @Author zqb
+ * @Date 2024/6/13
+ **/
+public class CheckDataUtil {
+
+	/**
+	 * 校验两个时间相差不超过 30 天
+	 * 如果不跨月则返回 true
+	 * 如果跨月则不超过 30 天
+	 *
+	 * @Param start 开始时间
+	 * @Param end 解释时间
+	 * @Return boolean
+	 * @Author zqb 2024/6/13
+	 **/
+	public static boolean isWithinOneMonth(Date start, Date end) {
+		// 检查输入是否为null
+		if (start == null || end == null) {
+			return false;
+		}
+
+		// 是否跨月，不跨越则直接返回true
+		if (DateUtil.year(start) == DateUtil.year(end) && DateUtil.month(start) == DateUtil.month(end)) {
+			return true;
+		}
+
+		// 跨越则判断两个日期是否相差超过30天
+		return DateUtil.between(start, end, DateUnit.DAY) <= 30;
+	}
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java

@@ -29,6 +29,7 @@ public class ThreadPoolUtil {
 			executor.shutdownNow();
 		}
 		executor = ExecutorBuilder.create()
+			// 设置核心线程
 			.setCorePoolSize(8)
 			.setMaxPoolSize(20)
 			.setThreadFactory(ThreadFactoryBuilder.create().setNamePrefix("logpm-report-").build())

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDevilerVO.java

@@ -1,5 +1,6 @@
 package com.logpm.report.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -25,6 +26,10 @@ public class ReportDevilerVO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "配送id")
+	@ExcelIgnore
+	private Long id;
+
 	@ApiModelProperty(value = "车次")
 	@ExcelProperty("车次")
 	private String trainNumber;