Merge branch 'v_log_20240904' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -212,8 +212,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Override
     public IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param) {
-
+        long start2 = System.currentTimeMillis();
         IPage<OrderGoodsVO> page = orderGoodsDao.pageOrderGoodsList(param);
+        long start3 = System.currentTimeMillis();
+        log.info("执行耗时2,{}",start3-start2);
         if(CollectionUtils.isNotEmpty(page.getRecords())){
             List<String> fleetNoList = new ArrayList<>();
             List<String> orderNoList = new ArrayList<>();
@@ -224,22 +226,27 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 }
                 orderNoList.add(record.getOrderNo());
             }
-            
+            long start5 = System.currentTimeMillis();
+            log.info("执行耗时3,{}",start5-start3);
             if(CollectionUtils.isNotEmpty(fleetNoList)){
                 List<OrderGoodsBindTruckNumDTO> bindTruckNumList = orderGoodsTruckBindDao.queryOrderGoodsTruckNum(fleetNoList);
                 Map<String, Integer> map = bindTruckNumList.stream().collect(
                         Collectors.toMap(OrderGoodsBindTruckNumDTO::getOrderGoodsNo,OrderGoodsBindTruckNumDTO :: getTruckNum));
                 page.getRecords().forEach(item->item.setDispatchedOrders(map.get(item.getOrderGoodsNo())));
             }
+            long start6 = System.currentTimeMillis();
+            log.info("执行耗时4,{}",start6-start5);
             Optional<Map<String, FeignOrderInfoVO>> orderListOption = orderService.queryListOrderByOrderNoList(orderNoList);
 
             if(!orderListOption.isPresent()){
                 log.warn("通过订单号批量查询订单信息失败，失败原因");
                 throw new ServiceSystemException(ResultEnum.DATA_ERROR,"查询货单对应的订单信息失败");
             }
-
+            long start7 = System.currentTimeMillis();
+            log.info("执行耗时5,{}",start7-start6);
             List<OrderGoods> orderGoods = orderGoodsDao.listInField(OrderGoods::getOrderNo, orderNoList);
-
+            long start8 = System.currentTimeMillis();
+            log.info("执行耗时6,{}",start8-start7);
 
             Map<String, BigDecimal> orderExtractWeightMap = new HashMap<>();
             for (OrderGoods orderGood : orderGoods) {
@@ -249,6 +256,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 orderExtractWeightMap.put(orderNo,Objects.nonNull(orderExtractWeightMap.get(orderNo))?
                         orderExtractWeightMap.get(orderNo).add(weight): weight);
             }
+            long start9 = System.currentTimeMillis();
+            log.info("执行耗时7,{}",start9-start8);
             Map<String, FeignOrderInfoVO> orderInfoMap = orderListOption.get();
             page.getRecords().forEach(item->{
                 FeignOrderInfoVO orderInfo = orderInfoMap.get(item.getOrderNo());
@@ -263,6 +272,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 log.info("货单号:{},提取吨数:{}, 已拉运吨数:{},剩余吨数:{}",item.getOrderGoodsNo(),item.getExtractWeight(),item.getAlreadyTransportWeight(),residueTransportWeight);
                 item.setResidueTransportWeight(residueTransportWeight);
             });
+            long start11 = System.currentTimeMillis();
+            log.info("执行耗时8,{}",start11-start9);
         }
         return page;
     }