♻️ refactor(mes): 优化 JDK8 的兼容性

YunaiV
1 parent dd85e6bd
Showing 11 changed files with 32 additions and 22 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanMachineryServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImplTest.java
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import java.util.List;
+import java.util.stream.Collectors;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -49,7 +50,7 @@ public class MesDvCheckPlanMachineryServiceImpl implements MesDvCheckPlanMachine
         // 1.4 跨方案类型唯一性校验（设备不能存在于同类型多个方案中）
         List<MesDvCheckPlanMachineryDO> existingMachineryList = getCheckPlanMachineryListByMachineryId(createReqVO.getMachineryId());
         if (CollUtil.isNotEmpty(existingMachineryList)) {
-            List<Long> existingPlanIds = existingMachineryList.stream().map(MesDvCheckPlanMachineryDO::getPlanId).toList();
+            List<Long> existingPlanIds = existingMachineryList.stream().map(MesDvCheckPlanMachineryDO::getPlanId).collect(Collectors.toList());
             List<MesDvCheckPlanDO> existingPlans = checkPlanService.getCheckPlanList(existingPlanIds);
             for (MesDvCheckPlanDO existPlan : existingPlans) {
                 // 如果存在不同于当前方案、但类型一致的计划方案，则拦截（一机多计划，但不允许同一机多同类型计划）
 package cn.iocoder.yudao.module.mes.service.tm.tool;
-import cn.hutool.core.collection.ListUtil;
+import java.util.Collections;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -128,9 +128,9 @@ public class MesTmToolServiceImpl implements MesTmToolService {
     @Override
     public List<MesTmToolDO> getToolList(Collection<Long> ids) {
         if (ids == null || ids.isEmpty()) {
-            return ListUtil.of();
+            return Collections.emptyList();
         }
-        return toolMapper.selectBatchIds(ids);
+        return toolMapper.selectByIds(ids);
     }
 }
@@ -31,6 +31,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -125,7 +126,7 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService {
         MesWmMaterialStockListReqVO stockQuery = new MesWmMaterialStockListReqVO().setItemId(line.getItemId())
                 .setWarehouseId(warehouse.getId()).setLocationId(location.getId()).setAreaId(area.getId());
         List<MesWmMaterialStockDO> stocks = materialStockService.getMaterialStockList(stockQuery)
-                .stream().filter(s -> s.getQuantity().compareTo(BigDecimal.ZERO) > 0).toList();
+                .stream().filter(s -> s.getQuantity().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
         if (CollUtil.isEmpty(stocks)) {
             // 线边库无该物料库存 → 生成不带批次的明细
 package cn.iocoder.yudao.module.mes.service.wm.outsourceissue;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
+
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -147,7 +148,7 @@ public class MesWmOutsourceIssueServiceImpl implements MesWmOutsourceIssueServic
                     allDetails, MesWmOutsourceIssueDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmOutsourceIssueLineDO line : lines) {
-                List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+                List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
@@ -220,7 +221,7 @@ public class MesWmOutsourceIssueServiceImpl implements MesWmOutsourceIssueServic
                 allDetails, MesWmOutsourceIssueDetailDO::getLineId);
         // 检查每行的明细数量
         for (MesWmOutsourceIssueLineDO line : lines) {
-            List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+            List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
             BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                     MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
             // 对比行数量与明细总数量
 package cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
+
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -166,7 +167,7 @@ public class MesWmOutsourceReceiptServiceImpl implements MesWmOutsourceReceiptSe
                     allDetails, MesWmOutsourceReceiptDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmOutsourceReceiptLineDO line : lines) {
-                List<MesWmOutsourceReceiptDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+                List<MesWmOutsourceReceiptDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmOutsourceReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.returnissue;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
+
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -162,7 +163,7 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
                     allDetails, MesWmReturnIssueDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmReturnIssueLineDO line : lines) {
-                List<MesWmReturnIssueDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+                List<MesWmReturnIssueDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmReturnIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.returnsales;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
+
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -164,7 +165,7 @@ public class MesWmReturnSalesServiceImpl implements MesWmReturnSalesService {
                     allDetails, MesWmReturnSalesDetailDO::getLineId);
             // 检查每行的明细数量
             for (MesWmReturnSalesLineDO line : lines) {
-                List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+                List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
                 BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
                         MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
                 // 对比行数量与明细总数量，不满足直接抛出
 package cn.iocoder.yudao.module.mes.service.wm.transfer;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
+
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -187,7 +188,7 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
                 allDetails, MesWmTransferDetailDO::getLineId);
         // 2. 遍历行和对应的明细，创建事务
         for (MesWmTransferLineDO line : lines) {
-            List<MesWmTransferDetailDO> details = detailMap.getOrDefault(line.getId(), ListUtil.of());
+            List<MesWmTransferDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
             for (MesWmTransferDetailDO detail : details) {
                 // 2.1 先执行出库：调拨移出（从源仓库扣减库存），出库数量基于当前明细的数量
                 Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
 package cn.iocoder.yudao.module.mes.service.wm.itemconsume;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
@@ -405,15 +406,15 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest {
         assertEquals(2, details.size());
         // 物料 A：有批次
-        MesWmItemConsumeDetailDO detailA = details.stream()
-                .filter(d -> itemA.equals(d.getItemId())).findFirst().orElseThrow();
+        MesWmItemConsumeDetailDO detailA = CollUtil.findOne(details,
+                d -> itemA.equals(d.getItemId()));
         assertEquals(0, new BigDecimal("10").compareTo(detailA.getQuantity()));
         assertNotNull(detailA.getMaterialStockId());
         assertEquals("BATCH-A", detailA.getBatchCode());
         // 物料 B：无批次
-        MesWmItemConsumeDetailDO detailB = details.stream()
-                .filter(d -> itemB.equals(d.getItemId())).findFirst().orElseThrow();
+        MesWmItemConsumeDetailDO detailB = CollUtil.findOne(details,
+                d -> itemB.equals(d.getItemId()));
         assertEquals(0, new BigDecimal("20").compareTo(detailB.getQuantity()));
         assertNull(detailB.getMaterialStockId());
     }
@@ -13,6 +13,7 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import java.math.BigDecimal;
+import java.util.List;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -100,7 +101,7 @@ public class MesWmReturnIssueLineServiceImplTest extends BaseDbUnitTest {
         assertEquals(0, qualifiedQty.compareTo(originalLine.getQuantity()));
         // 断言：新增了一行不合格品
-        var allLines = returnIssueLineMapper.selectListByIssueId(lineDO.getIssueId());
+        List<MesWmReturnIssueLineDO> allLines = returnIssueLineMapper.selectListByIssueId(lineDO.getIssueId());
         assertEquals(2, allLines.size());
         MesWmReturnIssueLineDO newLine = allLines.stream()
                 .filter(l -> !l.getId().equals(lineDO.getId()))
@@ -13,6 +13,7 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import java.math.BigDecimal;
+import java.util.List;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -100,7 +101,7 @@ public class MesWmReturnSalesLineServiceImplTest extends BaseDbUnitTest {
         assertEquals(0, qualifiedQty.compareTo(originalLine.getQuantity()));
         // 断言：新增了一行不合格品
-        var allLines = returnSalesLineMapper.selectListByReturnId(lineDO.getReturnId());
+        List<MesWmReturnSalesLineDO> allLines = returnSalesLineMapper.selectListByReturnId(lineDO.getReturnId());
         assertEquals(2, allLines.size());
         MesWmReturnSalesLineDO newLine = allLines.stream()
                 .filter(l -> !l.getId().equals(lineDO.getId()))