feat(mes): 新增设备点检记录相关功能，包括记录明细接口及表单组件

YunaiV
1 parent 2006ce7a
Showing 1 changed file with 20 additions and 21 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanMachineryController.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.dv.checkplan;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.checkplan.vo.machinery.MesDvCheckPlanMachineryRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.checkplan.vo.machinery.MesDvCheckPlanMachinerySaveReqVO;
@@ -19,10 +19,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 @Tag(name = "管理后台 - MES 点检保养方案设备")
 @RestController
@@ -58,27 +60,24 @@ public class MesDvCheckPlanMachineryController {
     public CommonResult<List<MesDvCheckPlanMachineryRespVO>> getCheckPlanMachineryListByPlan(
             @RequestParam("planId") Long planId) {
         List<MesDvCheckPlanMachineryDO> list = checkPlanMachineryService.getCheckPlanMachineryListByPlanId(planId);
-        List<MesDvCheckPlanMachineryRespVO> respList = BeanUtils.toBean(list, MesDvCheckPlanMachineryRespVO.class);
-        // TODO @AI：为空，直接 return；
-        // 拼装设备编码/名称/品牌/规格
-        // TODO @AI：拆出来，放在 buildVO 那；
-        if (CollUtil.isNotEmpty(respList)) {
-            // TODO @AI：convertMap；
-            List<Long> machineryIds = CollectionUtils.convertList(respList, MesDvCheckPlanMachineryRespVO::getMachineryId);
-            // TODO @AI：这里暂时没实现；
-            Map<Long, MesDvMachineryDO> machineryMap = machineryService.getMachineryMap(machineryIds);
-            respList.forEach(resp -> {
-                MesDvMachineryDO machinery = machineryMap.get(resp.getMachineryId());
-                if (machinery != null) {
-                    // TODO @AI：链式调用；
-                    resp.setMachineryCode(machinery.getCode());
-                    resp.setMachineryName(machinery.getName());
-                    resp.setMachineryBrand(machinery.getBrand());
-                    resp.setMachinerySpec(machinery.getSpec());
-                }
-            });
+        return success(buildCheckPlanMachineryRespVOList(list));
+    }
+
+    // ==================== 拼接 VO ====================
+
+    private List<MesDvCheckPlanMachineryRespVO> buildCheckPlanMachineryRespVOList(
+            List<MesDvCheckPlanMachineryDO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return Collections.emptyList();
         }
-        return success(respList);
+        Map<Long, MesDvMachineryDO> machineryMap = machineryService.getMachineryMap(
+                convertSet(list, MesDvCheckPlanMachineryDO::getMachineryId));
+        return BeanUtils.toBean(list, MesDvCheckPlanMachineryRespVO.class, vo ->
+            MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery ->
+                vo.setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
+                  .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())
+            )
+        );
     }
 }