fix: 解决因部分数据被删除导致功能报错的问题

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/PriceTemplateController.java

@@ -5,6 +5,7 @@ import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceAreaRespVO;
@@ -105,18 +106,8 @@ public class PriceTemplateController {
         Map<Long, RouteRespDTO> routeMap = routeApi.queryRoute(routeIds);
 
         list.stream().forEach(item -> {
-            ShipRespDTO shipRespDTO = shipMap.get(item.getShipId());
-            if(shipRespDTO != null) {
-                item.setShipName(shipRespDTO.getName());
-            }else {
-                item.setShipName("已删除");
-            }
-            RouteRespDTO routeRespDTO = routeMap.get(item.getRouteId());
-            if(routeRespDTO != null) {
-                item.setRouteName(routeRespDTO.getName());
-            }else {
-                item.setRouteName("已删除");
-            }
+            MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
+            MapUtils.findAndThen(routeMap, item.getRouteId(), route -> item.setRouteName(route.getName()));
         });
         return success(page);
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricevoyage/PriceVoyageController.java

@@ -193,18 +193,9 @@ public class PriceVoyageController {
         Map<Long, RouteRespDTO> routeMap = routeApi.queryRoute(routeIds);
 
         list.stream().forEach(item -> {
-            ShipRespDTO shipRespDTO = shipMap.get(item.getShipId());
-            if(shipRespDTO != null) {
-                item.setShipName(shipRespDTO.getName());
-            }
-            VoyageDO voyageDO = voyageMap.get(item.getVoyageId());
-            if(voyageDO != null) {
-                item.setVoyageName(voyageDO.getName());
-            }
-            RouteRespDTO routeRespDTO = routeMap.get(item.getRouteId());
-            if(routeRespDTO != null) {
-                item.setRouteName(routeRespDTO.getName());
-            }
+            MapUtils.findAndThen(shipMap, item.getShipId(), shipRespDTO -> item.setShipName(shipRespDTO.getName()));
+            MapUtils.findAndThen(voyageMap, item.getVoyageId(), VoyageDO -> item.setVoyageName(VoyageDO.getName()));
+            MapUtils.findAndThen(routeMap, item.getRouteId(), RouteRespDTO -> item.setRouteName(RouteRespDTO.getName()));
         });
         return success(page);
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/VoyageController.java

@@ -5,6 +5,7 @@ import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.module.product.controller.admin.voyage.vo.*;
@@ -107,8 +108,8 @@ public class VoyageController {
         List<ResourceRouteDO> routeList = routeService.getList(routeIds);
         Map<Long, ResourceRouteDO> routeDOMap = CollectionUtils.convertMap(routeList, ResourceRouteDO::getId);
         list.stream().forEach(item -> {
-            item.setShipName(shipDOMap.get(item.getShipId()).getName());
-            item.setRouteName(routeDOMap.get(item.getRouteId()).getName());
+            MapUtils.findAndThen(shipDOMap, item.getShipId(), shipDO -> item.setShipName(shipDO.getName()));
+            MapUtils.findAndThen(routeDOMap, item.getRouteId(), routeDO -> item.setRouteName(routeDO.getName()));
         });
         return success(page);
     }
@@ -132,9 +133,11 @@ public class VoyageController {
         List<Long> routeIds = CollectionUtils.convertList(voyageRespVOS, VoyageRespVO::getRouteId);
         Map<Long, RouteRespDTO> longRouteRespDTOMap = routeApi.queryRoute(routeIds);
         voyageRespVOS.stream().forEach(item -> {
-            item.setRouteName(longRouteRespDTOMap.get(item.getRouteId()).getName());
-            item.setRouteResp(longRouteRespDTOMap.get(item.getRouteId()));
-            item.setShipName(shipDOMap.get(item.getShipId()).getName());
+            MapUtils.findAndThen(shipDOMap, item.getShipId(), shipDO -> item.setShipName(shipDO.getName()));
+            MapUtils.findAndThen(longRouteRespDTOMap, item.getRouteId(), routeRespDTO -> {
+                item.setRouteResp(routeRespDTO);
+                item.setRouteName(routeRespDTO.getName());
+            });
         });
         return success(voyageRespVOS);
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/app/voyage/AppVoyageController.java

@@ -2,6 +2,7 @@ package com.yc.ship.module.product.controller.app.voyage;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
 import com.yc.ship.module.product.controller.admin.pricevoyage.vo.PriceVoyageRespVO;
@@ -107,10 +108,14 @@ public class AppVoyageController {
         });
 
         voyageRespVOS.stream().forEach(item -> {
-            item.setRouteName(longRouteRespDTOMap.get(item.getRouteId()).getName());
-            item.setRouteResp(longRouteRespDTOMap.get(item.getRouteId()));
-            item.setShipName(shipDOMap.get(item.getShipId()).getName());
-            item.setShipShortName(shipDOMap.get(item.getShipId()).getShortName());
+            MapUtils.findAndThen(shipDOMap, item.getShipId(), ship -> {
+                item.setShipShortName(ship.getShortName());
+                item.setShipName(ship.getName());
+            });
+            MapUtils.findAndThen(longRouteRespDTOMap, item.getRouteId(), route -> {
+                item.setRouteName(route.getName());
+                item.setRouteResp(route);
+            });
         });
         return success(voyageRespVOS);
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestock/VoyageStockServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.product.service.voyagestock;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
 import org.springframework.stereotype.Service;
@@ -74,7 +75,7 @@ public class VoyageStockServiceImpl implements VoyageStockService {
         List<Long> shipIds = CollectionUtils.convertList(list, VoyageStockRespVO::getShipId);
         Map<Long, ShipRespDTO> shipMap = shipApi.queryShip(shipIds);
         list.stream().forEach(item -> {
-            item.setShipName(shipMap.get(item.getShipId()).getName());
+            MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
         });
         return page;
     }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/dock/ResourceDockController.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.controller.admin.dock;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.resource.dal.dataobject.port.ResourcePortDO;
 import com.yc.ship.module.resource.service.port.ResourcePortService;
@@ -90,7 +91,7 @@ public class ResourceDockController {
         List<ResourcePortDO> portList = portService.getList(portIds);
         Map<Long, ResourcePortDO> longResourcePortDOMap = CollectionUtils.convertMap(portList, ResourcePortDO::getId);
         list.stream().forEach(item -> {
-            item.setPortName(longResourcePortDOMap.get(item.getPortId()).getName());
+            MapUtils.findAndThen(longResourcePortDOMap, item.getPortId(), port -> item.setPortName(port.getName()));
             if(item.getCountyId() != null) {
                 String area = AreaUtils.format(item.getCountyId());
                 item.setArea(area);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/ResourceRoomModelController.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.controller.admin.roommodel;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.module.resource.dal.dataobject.roommodelrooms.ResourceRoomModelRoomsDO;
 import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
 import com.yc.ship.module.resource.service.roomModelRooms.ResourceRoomModelRoomsService;
@@ -101,7 +102,7 @@ public class ResourceRoomModelController {
         List<ResourceShipDO> shipList = shipService.getList(shipIds);
         Map<Long, ResourceShipDO> longResourceShipDOMap = CollectionUtils.convertMap(shipList, ResourceShipDO::getId);
         list.stream().forEach(item -> {
-            item.setShipName(longResourceShipDOMap.get(item.getShipId()).getName());
+            MapUtils.findAndThen(longResourceShipDOMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
             item.setFloorsNumStr(item.getFloorsNum());
         });
         return success(page);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/ResourceRouteController.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.resource.controller.admin.route;
 import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.util.ObjectUtil;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.module.resource.controller.admin.category.vo.CategoryListReqVO;
 import com.yc.ship.module.resource.dal.dataobject.dock.ResourceDockDO;
 import com.yc.ship.module.resource.dal.dataobject.scenic.ResourceScenicDO;
@@ -121,8 +122,8 @@ public class ResourceRouteController {
         List<ResourceScenicDO> scenicDOS = scenicService.getList(scenicIds);
         Map<Long, ResourceScenicDO> longResourceScenicDOMap = CollectionUtils.convertMap(scenicDOS, ResourceScenicDO::getId);
         list.stream().forEach(item -> {
-            item.setOnDockName(longResourceDockDOMap.get(item.getOnDockId()).getName());
-            item.setLeaveDockName(longResourceDockDOMap.get(item.getLeaveDockId()).getName());
+            MapUtils.findAndThen(longResourceDockDOMap, item.getOnDockId(), dock -> item.setOnDockName(dock.getName()));
+            MapUtils.findAndThen(longResourceDockDOMap, item.getLeaveDockId(), dock -> item.setLeaveDockName(dock.getName()));
             List<Long> ids = Arrays.asList(item.getMidwayDockIds().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
             String names = ids.stream().map(id -> longResourceDockDOMap.get(id).getName()).collect(Collectors.joining(","));
             item.setMidwayDockNames(names);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/scenic/ResourceScenicController.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.controller.admin.scenic;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.resource.dal.dataobject.dock.ResourceDockDO;
 import com.yc.ship.module.resource.service.dock.ResourceDockService;
@@ -89,7 +90,7 @@ public class ResourceScenicController {
         List<ResourceDockDO> dockList = dockService.getList(dockIds);
         Map<Long, ResourceDockDO> longResourceDockDOMap = CollectionUtils.convertMap(dockList, ResourceDockDO::getId);
         list.stream().forEach(item -> {
-            item.setDockName(longResourceDockDOMap.get(item.getDockId()).getName());
+            MapUtils.findAndThen(longResourceDockDOMap, item.getDockId(), dock -> item.setDockName(dock.getName()));
             if(item.getCountyId() != null) {
                 String area = AreaUtils.format(item.getCountyId());
                 item.setArea(area);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/ship/ResourceShipController.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.resource.controller.admin.ship;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.module.resource.dal.dataobject.shiptype.ResourceShipTypeDO;
 import com.yc.ship.module.resource.dal.dataobject.supplier.ProductSupplierDO;
 import com.yc.ship.module.resource.service.shiptype.ResourceShipTypeService;
@@ -99,8 +100,8 @@ public class ResourceShipController {
         Map<Long, ProductSupplierDO> longProductSupplierDOMap = CollectionUtils.convertMap(supplierDOS, ProductSupplierDO::getId);
 
         list.stream().forEach(item -> {
-            item.setShipTypeName(longResourceShipTypeDOMap.get(item.getShipTypeId()).getName());
-            item.setSupplierName(longProductSupplierDOMap.get(item.getSupplierId()).getName());
+            MapUtils.findAndThen(longResourceShipTypeDOMap, item.getShipTypeId(), shipType -> item.setShipTypeName(shipType.getName()));
+            MapUtils.findAndThen(longProductSupplierDOMap, item.getSupplierId(), supplier -> item.setSupplierName(supplier.getName()));
         });
         return success(page);
     }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/app/scenic/AppResourceScenicController.java

@@ -4,6 +4,7 @@ import com.yc.ship.framework.common.enums.CommonStatusEnum;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.resource.controller.admin.scenic.vo.ResourceScenicPageReqVO;
@@ -49,7 +50,7 @@ public class AppResourceScenicController {
         List<ResourceDockDO> dockList = dockService.getList(dockIds);
         Map<Long, ResourceDockDO> longResourceDockDOMap = CollectionUtils.convertMap(dockList, ResourceDockDO::getId);
         list.stream().forEach(item -> {
-            item.setDockName(longResourceDockDOMap.get(item.getDockId()).getName());
+            MapUtils.findAndThen(longResourceDockDOMap, item.getDockId(), dock -> item.setDockName(dock.getName()));
             if(item.getCountyId() != null) {
                 String area = AreaUtils.format(item.getCountyId());
                 item.setArea(area);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.dict.core.DictFrameworkUtils;
 import com.yc.ship.framework.excel.core.annotations.DictFormat;
@@ -268,12 +269,13 @@ public class OtcTradeOrderController {
         Map<Long, VoyageRespVO> voyageRespVOMap = CollectionUtils.convertMap(voyageRespVOS, VoyageRespVO::getId);
 
         list.stream().forEach(item -> {
-            item.setShipName(shipMap.get(item.getShipId()).getName());
-            item.setCountryList(countryMap.get(item.getId()));
-            TradeOrderTotalVO totalVO = orderTotalVOMap.get(item.getId());
-            item.setSummary(totalVO);
-            item.setPersonStat(totalVO.getAdultTotalNum()+"大"+(totalVO.getChildTotalNum()+totalVO.getBabyTotalNum())+"小");
-            item.setVoyage(voyageRespVOMap.get(item.getVoyageId()));
+            MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
+            MapUtils.findAndThen(countryMap, item.getId(), country -> item.setCountryList(country));
+            MapUtils.findAndThen(orderTotalVOMap, item.getId(), totalVO -> {
+                item.setSummary(totalVO);
+                item.setPersonStat(totalVO.getAdultTotalNum()+"大"+(totalVO.getChildTotalNum()+totalVO.getBabyTotalNum())+"小");
+            });
+            MapUtils.findAndThen(voyageRespVOMap, item.getVoyageId(), voyage -> item.setVoyage(voyage));
         });
         return success(page);
     }