From b4ebdd7073fb65c526c40f21f84ddbf9e498e5fa Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sun, 2 Mar 2025 22:02:52 +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/BasePartController.java      | 15 ++++++++++-----
 .../controller/DeviceComponentController.java     |  5 +----
 .../resources/mapper/DeviceComponentMapper.xml    |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BasePartController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BasePartController.java
index 02610fe2..9a345658 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BasePartController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BasePartController.java
@@ -187,9 +187,9 @@ public class BasePartController extends ControllerBase{
      */
     @PostMapping("enable")
     @MethodInfoMark(value = "启用",menuName = "部件管理")
-    public ApiResult<Boolean> enable(@RequestBody List<Long> ids ){
+    public ApiResult<Boolean> enable(@RequestBody List<Integer> ids ){
         VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据");
-        partService.lambdaUpdate().in(TBasePart::getId,ids).set(TBasePart::getEnable,1);
+        partService.lambdaUpdate().in(TBasePart::getId,ids).set(TBasePart::getEnable,1).update();
         return ApiResult.success(true);
     }
 
@@ -201,15 +201,20 @@ public class BasePartController extends ControllerBase{
      */
     @PostMapping("disable")
     @MethodInfoMark(value = "禁用",menuName = "部件管理")
-    public ApiResult<Boolean> disable(@RequestBody List<Long> ids ){
+    public ApiResult<Boolean> disable(@RequestBody List<Integer> ids ){
         VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要禁用的数据");
-        partService.lambdaUpdate().in(TBasePart::getId,ids).set(TBasePart::getEnable,0);
+        partService.lambdaUpdate().in(TBasePart::getId,ids).set(TBasePart::getEnable,0).update();
+
 
         return ApiResult.success(true);
     }
 
+    /**
+     * 导入部件
+     * @param file
+     * @return
+     */
     @PostMapping("importData")
-    @ApiMark(moduleName = "部件管理", apiName = "导入")
     public ApiResult<Boolean> importData( @RequestParam(value = "file") MultipartFile file){
         List<Map<String,Object>> result=new ArrayList<>();
         try (ExcelReader reader = ExcelReader.read(file.getInputStream())) {
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 979e95d4..ba38de98 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
@@ -176,7 +176,6 @@ public class DeviceComponentController extends ControllerBase {
      * @return
      */
     @PostMapping("importData")
-    @ApiMark(moduleName = "机型部件管理", apiName = "导入部件")
     public ApiResult<Boolean> importData( @RequestParam(value = "file") MultipartFile file){
 
         try {
@@ -213,7 +212,7 @@ public class DeviceComponentController extends ControllerBase {
                     ent.setDeviceComponentId(extstsModeMap.get(key).getId());
                     ent.setModelPartId(exitsPartMap.get(componment.getModelPartName()).getId());
                     ent.setModelPartName(componment.getModelPartName());
-                    ent.setCreateBy(AdminUserUtil.getUserName());
+                    ent.setCreateBy("fdf");
                     ent.setCreateTime(LocalDateTime.now());
                     result.add(ent);
                 }
@@ -227,8 +226,6 @@ public class DeviceComponentController extends ControllerBase {
                 deviceComponentDetailService.saveOrUpdateBatch(result);
             }
 
-            deviceComponentService.saveOrUpdateBatchComponent(Convert.toList(DeviceComponent.class, data));
-
         } catch (IOException e) {
             throw new NflgException(STATE.BusinessError, "导入失败："+e.getMessage());
         }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml
index 74ea2227..ee283720 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml
@@ -19,5 +19,6 @@
     select  a.model_no,b.model_part_name,b.create_by,b.create_time
     from device_component a
     join device_component_detail b on a.id=b.device_component_id
+    join t_base_part c on b.model_part_id=c.id
   </select>
 </mapper>