From e495710f2a304b215cd3eb9dd4dfd9ea7a97a56a Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sun, 2 Mar 2025 17:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=AE=A1=E7=90=86-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/DeviceComponentController.java         | 4 ++--
 .../common/pojo/vo/DeviceComponentDetailVO.java             | 5 +++++
 .../repository/mapper/DeviceComponentDetailMapper.java      | 3 +++
 .../repository/service/IDeviceComponentDetailService.java   | 3 +++
 .../service/impl/DeviceComponentDetailServiceImpl.java      | 5 +++++
 .../main/resources/mapper/DeviceComponentDetailMapper.xml   | 6 ++++++
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
index 2e5716de..979e95d4 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
@@ -68,7 +68,7 @@ public class DeviceComponentController extends ControllerBase {
     public ApiResult<PageData<DeviceComponentVO>> getList(@RequestBody DeviceComponentQuery query){
         Page<DeviceComponentVO> result = deviceComponentService.selectListByPage(query);
         result.getRecords().forEach(u->{
-            List<DeviceComponentDetail> detail = deviceComponentDetailService.lambdaQuery().eq(DeviceComponentDetail::getDeviceComponentId, u.getId()).list();
+            List<DeviceComponentDetailVO> detail = deviceComponentDetailService.getDevicePartDetail(u.getId());
             u.setPartList(Convert.toList(DeviceComponentDetailVO.class,detail));
         });
         return ApiResult.success(result.getRecords(),query,result.getTotal());
@@ -80,7 +80,7 @@ public class DeviceComponentController extends ControllerBase {
      * @return
      */
     @GetMapping("getModelPartList")
-    @ApiMark(moduleName = "机型部件管理", apiName = "获取机型部件列表")
+    @ApiMark(moduleName = "机型部件管理", apiName = "获取机型已设置部件列表")
     public ApiResult<List<DeviceComponentDetailDTO>> getModelPartList(@RequestParam("deviceComponentId") Integer deviceComponentId){
         if (deviceComponentId == null) {
             throw new NflgException(STATE.ParamErr, "设备ID不能为空");
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceComponentDetailVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceComponentDetailVO.java
index d243dec7..e7f30530 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceComponentDetailVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceComponentDetailVO.java
@@ -56,4 +56,9 @@ public class DeviceComponentDetailVO implements Serializable {
      * 创建时间
      */
     private LocalDateTime createTime;
+
+    /**
+     * 部件编码
+     */
+    private String partNo;
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentDetailMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentDetailMapper.java
index fa3aaaba..fc3b1fbb 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentDetailMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentDetailMapper.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.repository.mapper;
 
+import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO;
 import com.nflg.mobilebroken.repository.entity.DeviceComponentDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface DeviceComponentDetailMapper extends BaseMapper<DeviceComponentD
     void  delByComponentId(@Param("componentId") Integer componentId);
 
     void  batchDelByComponentId(@Param("componentIds") List<Integer>  componentIds);
+
+    List<DeviceComponentDetailVO> getDevicePartDetail(@Param("deviceComponentId") Integer deviceComponentId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentDetailService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentDetailService.java
index 137228ce..876eedf7 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentDetailService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentDetailService.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.repository.service;
 
+import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO;
 import com.nflg.mobilebroken.repository.entity.DeviceComponentDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,6 @@ public interface IDeviceComponentDetailService extends IService<DeviceComponentD
     void  delByComponentId(@Param("componentId") Integer componentId);
 
     void  batchDelByComponentId(@Param("componentIds") List<Integer> componentIds);
+
+    List<DeviceComponentDetailVO> getDevicePartDetail(@Param("deviceComponentId") Integer deviceComponentId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentDetailServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentDetailServiceImpl.java
index d5735948..05251b7c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentDetailServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentDetailServiceImpl.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.repository.service.impl;
 
+import com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO;
 import com.nflg.mobilebroken.repository.entity.DeviceComponentDetail;
 import com.nflg.mobilebroken.repository.mapper.DeviceComponentDetailMapper;
 import com.nflg.mobilebroken.repository.service.IDeviceComponentDetailService;
@@ -27,4 +28,8 @@ public class DeviceComponentDetailServiceImpl extends ServiceImpl<DeviceComponen
    public void  batchDelByComponentId(@Param("componentIds") List<Integer> componentIds){
        this.getBaseMapper().batchDelByComponentId(componentIds);
    }
+
+   public List<DeviceComponentDetailVO> getDevicePartDetail(@Param("deviceComponentId") Integer deviceComponentId){
+       return this.getBaseMapper().getDevicePartDetail(deviceComponentId);
+   }
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentDetailMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentDetailMapper.xml
index 85b593d3..acd94a9a 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentDetailMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentDetailMapper.xml
@@ -13,4 +13,10 @@
                 #{item}
             </foreach>
     </delete>
+
+    <select id="getDevicePartDetail" resultType="com.nflg.mobilebroken.common.pojo.vo.DeviceComponentDetailVO">
+        select a.* ,b.part_no from device_component_detail a
+                                       join t_base_part b on a.model_part_id=b.id
+        where a.device_component_id=#{deviceComponentId}
+    </select>
 </mapper>