Переглянути джерело

格式化, 删除错误字段

Gaokun Wang 7 місяців тому
батько
коміт
91d2abfc00
77 змінених файлів з 1309 додано та 887 видалено
  1. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/AirConfigurationController.java
  2. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/AirInstallController.java
  3. 5 0
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/AlgorithmController.java
  4. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultCaseController.java
  5. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultConsumableController.java
  6. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultEquipmentController.java
  7. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultNotesController.java
  8. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultPersonnelController.java
  9. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultSetpsController.java
  10. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultSparePartsController.java
  11. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/MaintenanceController.java
  12. 8 8
      als-modules/agile-assurance/src/main/java/org/eco/als/controller/PartReplacementController.java
  13. 31 23
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/AirConfiguration.java
  14. 43 28
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/AirInstall.java
  15. 27 10
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultEquipment.java
  16. 21 8
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultSetps.java
  17. 36 13
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/PartReplacement.java
  18. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AirInstallBo.java
  19. 1 1
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultCaseBo.java
  20. 1 1
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultConsumableBo.java
  21. 1 1
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultEquipmentBo.java
  22. 1 1
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultNotesBo.java
  23. 52 50
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirConfigurationImportVo.java
  24. 32 28
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirConfigurationVo.java
  25. 76 65
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallImportVo.java
  26. 44 31
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallVo.java
  27. 55 35
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultCaseImportVo.java
  28. 34 12
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultCaseVo.java
  29. 31 19
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultConsumableImportVo.java
  30. 37 21
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultEquipmentImportVo.java
  31. 19 7
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultNotesVo.java
  32. 25 9
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultPersonnelVo.java
  33. 31 19
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSetpsImportVo.java
  34. 37 21
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSparePartsImportVo.java
  35. 28 10
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSparePartsVo.java
  36. 124 82
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceImportVo.java
  37. 67 23
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceVo.java
  38. 61 39
      als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/PartReplacementImportVo.java
  39. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/AirConfigurationImportListener.java
  40. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/AirInstallImportListener.java
  41. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultCaseImportListener.java
  42. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultConsumableImportListener.java
  43. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultEquipmentImportListener.java
  44. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultNotesImportListener.java
  45. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultPersonnelImportListener.java
  46. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultSetpsImportListener.java
  47. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultSparePartsImportListener.java
  48. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/MaintenanceImportListener.java
  49. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/listener/PartReplacementImportListener.java
  50. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IAirConfigurationService.java
  51. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IAirInstallService.java
  52. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IAlgorithmService.java
  53. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultCaseService.java
  54. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultConsumableService.java
  55. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultEquipmentService.java
  56. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultNotesService.java
  57. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultPersonnelService.java
  58. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultSetpsService.java
  59. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultSparePartsService.java
  60. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IMaintenanceService.java
  61. 3 1
      als-modules/agile-assurance/src/main/java/org/eco/als/service/IPartReplacementService.java
  62. 1 0
      als-modules/agile-assurance/src/main/java/org/eco/als/service/ITaskService.java
  63. 19 17
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AirConfigurationServiceImpl.java
  64. 23 21
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AirInstallServiceImpl.java
  65. 32 32
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java
  66. 20 18
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultCaseServiceImpl.java
  67. 16 14
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultConsumableServiceImpl.java
  68. 2 2
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultDiagnosisServiceImpl.java
  69. 18 16
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultEquipmentServiceImpl.java
  70. 15 13
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultNotesServiceImpl.java
  71. 17 15
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultPersonnelServiceImpl.java
  72. 16 14
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultSetpsServiceImpl.java
  73. 18 16
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultSparePartsServiceImpl.java
  74. 2 2
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/LifePredictionServiceImpl.java
  75. 31 29
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/MaintenanceServiceImpl.java
  76. 21 19
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/PartReplacementServiceImpl.java
  77. 2 2
      als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/WarningServiceImpl.java

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/AirConfigurationController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.AirConfigurationVo;
 import org.eco.als.domain.bo.AirConfigurationBo;
 import org.eco.als.service.IAirConfigurationService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class AirConfigurationController extends BaseController {
     @Resource
     private IAirConfigurationService airConfigurationService;
 
-/**
- * 查询飞机构型列表
- */
-@SaCheckPermission("als:airConfiguration:list")
-@GetMapping("/list")
+    /**
+     * 查询飞机构型列表
+     */
+    @SaCheckPermission("als:airConfiguration:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<AirConfigurationVo>> list(AirConfigurationBo airConfigurationBo) {
         return CommonResult.success(airConfigurationService.selectPage(airConfigurationBo));
     }
@@ -60,7 +60,7 @@ public class AirConfigurationController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            airConfigurationService.asyncExport(list, "飞机构型", loginUser);
+        airConfigurationService.asyncExport(list, "飞机构型", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class AirConfigurationController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            airConfigurationService.asyncImportData(file, updateSupport, loginUser);
+        airConfigurationService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/AirInstallController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.AirInstallVo;
 import org.eco.als.domain.bo.AirInstallBo;
 import org.eco.als.service.IAirInstallService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class AirInstallController extends BaseController {
     @Resource
     private IAirInstallService airInstallService;
 
-/**
- * 查询装机信息列表
- */
-@SaCheckPermission("als:airInstall:list")
-@GetMapping("/list")
+    /**
+     * 查询装机信息列表
+     */
+    @SaCheckPermission("als:airInstall:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<AirInstallVo>> list(AirInstallBo airInstallBo) {
         return CommonResult.success(airInstallService.selectPage(airInstallBo));
     }
@@ -60,7 +60,7 @@ public class AirInstallController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            airInstallService.asyncExport(list, "装机信息", loginUser);
+        airInstallService.asyncExport(list, "装机信息", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class AirInstallController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            airInstallService.asyncImportData(file, updateSupport, loginUser);
+        airInstallService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 5 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/controller/AlgorithmController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 算法相关控制
+ *
  * @Author: GaoKun Wang
  * @Date: 2024/7/30
  */
@@ -31,6 +32,7 @@ public class AlgorithmController {
 
     /**
      * 执行预处理
+     *
      * @param algorithmBo 入参
      * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
      **/
@@ -43,6 +45,7 @@ public class AlgorithmController {
 
     /**
      * 执行虚警抑制
+     *
      * @param algorithmBo 入参
      * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
      **/
@@ -55,6 +58,7 @@ public class AlgorithmController {
 
     /**
      * 执行古战诊断
+     *
      * @param algorithmBo 入参
      * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
      **/
@@ -67,6 +71,7 @@ public class AlgorithmController {
 
     /**
      * 执行任务管理
+     *
      * @param taskBo 入参
      * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
      **/

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultCaseController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultCaseVo;
 import org.eco.als.domain.bo.FaultCaseBo;
 import org.eco.als.service.IFaultCaseService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultCaseController extends BaseController {
     @Resource
     private IFaultCaseService faultCaseService;
 
-/**
- * 查询故障案例列表
- */
-@SaCheckPermission("als:faultCase:list")
-@GetMapping("/list")
+    /**
+     * 查询故障案例列表
+     */
+    @SaCheckPermission("als:faultCase:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultCaseVo>> list(FaultCaseBo faultCaseBo) {
         return CommonResult.success(faultCaseService.selectPage(faultCaseBo));
     }
@@ -60,7 +60,7 @@ public class FaultCaseController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultCaseService.asyncExport(list, "故障案例", loginUser);
+        faultCaseService.asyncExport(list, "故障案例", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultCaseController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultCaseService.asyncImportData(file, updateSupport, loginUser);
+        faultCaseService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultConsumableController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultConsumableVo;
 import org.eco.als.domain.bo.FaultConsumableBo;
 import org.eco.als.service.IFaultConsumableService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultConsumableController extends BaseController {
     @Resource
     private IFaultConsumableService faultConsumableService;
 
-/**
- * 查询故障所需耗材列表
- */
-@SaCheckPermission("als:faultConsumable:list")
-@GetMapping("/list")
+    /**
+     * 查询故障所需耗材列表
+     */
+    @SaCheckPermission("als:faultConsumable:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultConsumableVo>> list(FaultConsumableBo faultConsumableBo) {
         return CommonResult.success(faultConsumableService.selectPage(faultConsumableBo));
     }
@@ -60,7 +60,7 @@ public class FaultConsumableController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultConsumableService.asyncExport(list, "故障所需耗材", loginUser);
+        faultConsumableService.asyncExport(list, "故障所需耗材", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultConsumableController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultConsumableService.asyncImportData(file, updateSupport, loginUser);
+        faultConsumableService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultEquipmentController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultEquipmentVo;
 import org.eco.als.domain.bo.FaultEquipmentBo;
 import org.eco.als.service.IFaultEquipmentService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultEquipmentController extends BaseController {
     @Resource
     private IFaultEquipmentService faultEquipmentService;
 
-/**
- * 查询故障所需设备列表
- */
-@SaCheckPermission("als:faultEquipment:list")
-@GetMapping("/list")
+    /**
+     * 查询故障所需设备列表
+     */
+    @SaCheckPermission("als:faultEquipment:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultEquipmentVo>> list(FaultEquipmentBo faultEquipmentBo) {
         return CommonResult.success(faultEquipmentService.selectPage(faultEquipmentBo));
     }
@@ -60,7 +60,7 @@ public class FaultEquipmentController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultEquipmentService.asyncExport(list, "故障所需设备", loginUser);
+        faultEquipmentService.asyncExport(list, "故障所需设备", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultEquipmentController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultEquipmentService.asyncImportData(file, updateSupport, loginUser);
+        faultEquipmentService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultNotesController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultNotesVo;
 import org.eco.als.domain.bo.FaultNotesBo;
 import org.eco.als.service.IFaultNotesService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultNotesController extends BaseController {
     @Resource
     private IFaultNotesService faultNotesService;
 
-/**
- * 查询故障注意事项列表
- */
-@SaCheckPermission("als:faultNotes:list")
-@GetMapping("/list")
+    /**
+     * 查询故障注意事项列表
+     */
+    @SaCheckPermission("als:faultNotes:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultNotesVo>> list(FaultNotesBo faultNotesBo) {
         return CommonResult.success(faultNotesService.selectPage(faultNotesBo));
     }
@@ -60,7 +60,7 @@ public class FaultNotesController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultNotesService.asyncExport(list, "故障注意事项", loginUser);
+        faultNotesService.asyncExport(list, "故障注意事项", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultNotesController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultNotesService.asyncImportData(file, updateSupport, loginUser);
+        faultNotesService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultPersonnelController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultPersonnelVo;
 import org.eco.als.domain.bo.FaultPersonnelBo;
 import org.eco.als.service.IFaultPersonnelService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultPersonnelController extends BaseController {
     @Resource
     private IFaultPersonnelService faultPersonnelService;
 
-/**
- * 查询故障操作人员列表
- */
-@SaCheckPermission("als:faultPersonnel:list")
-@GetMapping("/list")
+    /**
+     * 查询故障操作人员列表
+     */
+    @SaCheckPermission("als:faultPersonnel:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultPersonnelVo>> list(FaultPersonnelBo faultPersonnelBo) {
         return CommonResult.success(faultPersonnelService.selectPage(faultPersonnelBo));
     }
@@ -60,7 +60,7 @@ public class FaultPersonnelController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultPersonnelService.asyncExport(list, "故障操作人员", loginUser);
+        faultPersonnelService.asyncExport(list, "故障操作人员", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultPersonnelController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultPersonnelService.asyncImportData(file, updateSupport, loginUser);
+        faultPersonnelService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultSetpsController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultSetpsVo;
 import org.eco.als.domain.bo.FaultSetpsBo;
 import org.eco.als.service.IFaultSetpsService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultSetpsController extends BaseController {
     @Resource
     private IFaultSetpsService faultSetpsService;
 
-/**
- * 查询故障操作步骤列表
- */
-@SaCheckPermission("als:faultSetps:list")
-@GetMapping("/list")
+    /**
+     * 查询故障操作步骤列表
+     */
+    @SaCheckPermission("als:faultSetps:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultSetpsVo>> list(FaultSetpsBo faultSetpsBo) {
         return CommonResult.success(faultSetpsService.selectPage(faultSetpsBo));
     }
@@ -60,7 +60,7 @@ public class FaultSetpsController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultSetpsService.asyncExport(list, "故障操作步骤", loginUser);
+        faultSetpsService.asyncExport(list, "故障操作步骤", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultSetpsController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultSetpsService.asyncImportData(file, updateSupport, loginUser);
+        faultSetpsService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultSparePartsController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.FaultSparePartsVo;
 import org.eco.als.domain.bo.FaultSparePartsBo;
 import org.eco.als.service.IFaultSparePartsService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class FaultSparePartsController extends BaseController {
     @Resource
     private IFaultSparePartsService faultSparePartsService;
 
-/**
- * 查询故障所需备件列表
- */
-@SaCheckPermission("als:faultSpareParts:list")
-@GetMapping("/list")
+    /**
+     * 查询故障所需备件列表
+     */
+    @SaCheckPermission("als:faultSpareParts:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<FaultSparePartsVo>> list(FaultSparePartsBo faultSparePartsBo) {
         return CommonResult.success(faultSparePartsService.selectPage(faultSparePartsBo));
     }
@@ -60,7 +60,7 @@ public class FaultSparePartsController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            faultSparePartsService.asyncExport(list, "故障所需备件", loginUser);
+        faultSparePartsService.asyncExport(list, "故障所需备件", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class FaultSparePartsController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            faultSparePartsService.asyncImportData(file, updateSupport, loginUser);
+        faultSparePartsService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/MaintenanceController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.MaintenanceVo;
 import org.eco.als.domain.bo.MaintenanceBo;
 import org.eco.als.service.IMaintenanceService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class MaintenanceController extends BaseController {
     @Resource
     private IMaintenanceService maintenanceService;
 
-/**
- * 查询维修信息列表
- */
-@SaCheckPermission("als:maintenance:list")
-@GetMapping("/list")
+    /**
+     * 查询维修信息列表
+     */
+    @SaCheckPermission("als:maintenance:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<MaintenanceVo>> list(MaintenanceBo maintenanceBo) {
         return CommonResult.success(maintenanceService.selectPage(maintenanceBo));
     }
@@ -60,7 +60,7 @@ public class MaintenanceController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            maintenanceService.asyncExport(list, "维修信息", loginUser);
+        maintenanceService.asyncExport(list, "维修信息", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class MaintenanceController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            maintenanceService.asyncImportData(file, updateSupport, loginUser);
+        maintenanceService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 8 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/controller/PartReplacementController.java

@@ -20,7 +20,7 @@ import org.eco.als.domain.vo.PartReplacementVo;
 import org.eco.als.domain.bo.PartReplacementBo;
 import org.eco.als.service.IPartReplacementService;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.core.page.PageResult;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -39,11 +39,11 @@ public class PartReplacementController extends BaseController {
     @Resource
     private IPartReplacementService partReplacementService;
 
-/**
- * 查询换件记录列表
- */
-@SaCheckPermission("als:partReplacement:list")
-@GetMapping("/list")
+    /**
+     * 查询换件记录列表
+     */
+    @SaCheckPermission("als:partReplacement:list")
+    @GetMapping("/list")
     public CommonResult<PageResult<PartReplacementVo>> list(PartReplacementBo partReplacementBo) {
         return CommonResult.success(partReplacementService.selectPage(partReplacementBo));
     }
@@ -60,7 +60,7 @@ public class PartReplacementController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            partReplacementService.asyncExport(list, "换件记录", loginUser);
+        partReplacementService.asyncExport(list, "换件记录", loginUser);
         return CommonResult.success();
     }
 
@@ -78,7 +78,7 @@ public class PartReplacementController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            partReplacementService.asyncImportData(file, updateSupport, loginUser);
+        partReplacementService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 31 - 23
als-modules/agile-assurance/src/main/java/org/eco/als/domain/AirConfiguration.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -21,49 +23,55 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_air_configuration_t")
 public class AirConfiguration extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 唯一ID */
+    /**
+     * 唯一ID
+     */
     @Id
     private Long id;
 
-    /** 机型 */
+    /**
+     * 机型
+     */
     private String aircraftType;
 
-    /** 构型编码 */
+    /**
+     * 构型编码
+     */
     private String conCode;
 
-    /** 产品名称 */
+    /**
+     * 产品名称
+     */
     private String name;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     private String specsModel;
 
-    /** 图号 */
+    /**
+     * 图号
+     */
     private String drawingNumber;
 
-    /** 供应商 */
+    /**
+     * 供应商
+     */
     private String supplier;
 
-    /** 描述 */
+    /**
+     * 描述
+     */
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 
-    /** 创建人 */
-    private String createdBy;
-
-    /** 创建时间 */
-    private Date createdTime;
-
-    /** 更新人 */
-    private String updatedBy;
-
-    /** 更新时间 */
-    private Date updatedTime;
-
 
 }

+ 43 - 28
als-modules/agile-assurance/src/main/java/org/eco/als/domain/AirInstall.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -21,61 +23,74 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_air_install_t")
 public class AirInstall extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 唯一ID */
+    /**
+     * 唯一ID
+     */
     @Id
     private Long id;
 
-    /** 航材编码 */
+    /**
+     * 航材编码
+     */
     private String materialCode;
 
-    /** 航材名称 */
+    /**
+     * 航材名称
+     */
     private String materialName;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     private String specsModel;
 
-    /** 图号 */
+    /**
+     * 图号
+     */
     private String drawingNumber;
 
-    /** 所属分类 */
+    /**
+     * 所属分类
+     */
     private String category;
 
-    /** 装机数量 */
+    /**
+     * 装机数量
+     */
     private String quantity;
 
-    /** 装机时间 */
+    /**
+     * 装机时间
+     */
     private String installTime;
 
-    /** 是否可修 */
+    /**
+     * 是否可修
+     */
     private String repairable;
 
-    /** 是否成套 */
+    /**
+     * 是否成套
+     */
     private String completeSet;
 
-    /** 是否有寿 */
+    /**
+     * 是否有寿
+     */
     private String serviceLife;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 
-    /** 创建人 */
-    private String createdBy;
-
-    /** 创建时间 */
-    private Date createdTime;
-
-    /** 更新人 */
-    private String updatedBy;
-
-    /** 更新时间 */
-    private Date updatedTime;
-
-
 }

+ 27 - 10
als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultEquipment.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -19,32 +20,48 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_fault_equipment_t")
 public class FaultEquipment extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Id
     private Long id;
 
-    /** 设备编号 */
+    /**
+     * 设备编号
+     */
     private String equipmentCode;
 
-    /** 设备名称 */
+    /**
+     * 设备名称
+     */
     private String equipmentName;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     private String modelNumber;
 
-    /** 数量 */
+    /**
+     * 数量
+     */
     private Integer quantity;
 
-    /** 用途 */
+    /**
+     * 用途
+     */
     private String purpose;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 

+ 21 - 8
als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultSetps.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -19,26 +20,38 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_fault_setps_t")
 public class FaultSetps extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Id
     private Long id;
 
-    /** 操作步骤 */
+    /**
+     * 操作步骤
+     */
     private Integer setps;
 
-    /** 操作方法 */
+    /**
+     * 操作方法
+     */
     private String method;
 
-    /** 图片 */
+    /**
+     * 图片
+     */
     private String image;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 

+ 36 - 13
als-modules/agile-assurance/src/main/java/org/eco/als/domain/PartReplacement.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -19,41 +20,63 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_part_replacement_t")
 public class PartReplacement extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Id
     private Long id;
 
-    /** 飞机编码 */
+    /**
+     * 飞机编码
+     */
     private String aircraftCode;
 
-    /** 换件前器材编码 */
+    /**
+     * 换件前器材编码
+     */
     private String beforeEquipmentCode;
 
-    /** 换件前器材名称 */
+    /**
+     * 换件前器材名称
+     */
     private String beforeEquipmentName;
 
-    /** 换件前规格型号 */
+    /**
+     * 换件前规格型号
+     */
     private String beforeModelNumber;
 
-    /** 换件后器材编码 */
+    /**
+     * 换件后器材编码
+     */
     private String afterEquipmentCode;
 
-    /** 换件后器材名称 */
+    /**
+     * 换件后器材名称
+     */
     private String afterEquipmentName;
 
-    /** 换件后规格型号 */
+    /**
+     * 换件后规格型号
+     */
     private String afterModelNumber;
 
-    /** 更换数量 */
+    /**
+     * 更换数量
+     */
     private String quantity;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AirInstallBo.java

@@ -5,7 +5,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.eco.common.orm.core.domain.BaseEntity;
 
@@ -18,7 +20,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = AirInstall.class, reverseConvertGenerate = false)
-public class AirInstallBo extends BaseEntity{
+public class AirInstallBo extends BaseEntity {
     /**
      * 唯一ID
      */

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultCaseBo.java

@@ -16,7 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultCase.class, reverseConvertGenerate = false)
-public class FaultCaseBo extends BaseEntity{
+public class FaultCaseBo extends BaseEntity {
     /**
      * 编号
      */

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultConsumableBo.java

@@ -16,7 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultConsumable.class, reverseConvertGenerate = false)
-public class FaultConsumableBo extends BaseEntity{
+public class FaultConsumableBo extends BaseEntity {
     /**
      * 编号
      */

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultEquipmentBo.java

@@ -16,7 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultEquipment.class, reverseConvertGenerate = false)
-public class FaultEquipmentBo extends BaseEntity{
+public class FaultEquipmentBo extends BaseEntity {
     /**
      * 编号
      */

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultNotesBo.java

@@ -16,7 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultNotes.class, reverseConvertGenerate = false)
-public class FaultNotesBo extends BaseEntity{
+public class FaultNotesBo extends BaseEntity {
     /**
      * 编号
      */

+ 52 - 50
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirConfigurationImportVo.java

@@ -1,14 +1,17 @@
 package org.eco.als.domain.vo;
 
-    import java.util.Date;
-    import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -27,53 +30,52 @@ public class AirConfigurationImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 机型 */
-                    @ExcelProperty(value = "机型")
-                private String aircraftType;
-
-                /** 构型编码 */
-                    @ExcelProperty(value = "构型编码")
-                private String conCode;
-
-                /** 产品名称 */
-                    @ExcelProperty(value = "产品名称")
-                private String name;
-
-                /** 规格型号 */
-                    @ExcelProperty(value = "规格型号")
-                private String specsModel;
-
-                /** 图号 */
-                    @ExcelProperty(value = "图号")
-                private String drawingNumber;
-
-                /** 供应商 */
-                    @ExcelProperty(value = "供应商")
-                private String supplier;
-
-                /** 描述 */
-                    @ExcelProperty(value = "描述")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
-
-                /** 创建人 */
-                    @ExcelProperty(value = "创建人")
-                    private String createdBy;
-
-                /** 创建时间 */
-                    @ExcelProperty(value = "创建时间")
-                    private Date createdTime;
-
-                /** 更新人 */
-                    @ExcelProperty(value = "更新人")
-                    private String updatedBy;
-
-                /** 更新时间 */
-                    @ExcelProperty(value = "更新时间")
-                    private Date updatedTime;
-
+    /**
+     * 机型
+     */
+    @ExcelProperty(value = "机型")
+    private String aircraftType;
+
+    /**
+     * 构型编码
+     */
+    @ExcelProperty(value = "构型编码")
+    private String conCode;
+
+    /**
+     * 产品名称
+     */
+    @ExcelProperty(value = "产品名称")
+    private String name;
+
+    /**
+     * 规格型号
+     */
+    @ExcelProperty(value = "规格型号")
+    private String specsModel;
+
+    /**
+     * 图号
+     */
+    @ExcelProperty(value = "图号")
+    private String drawingNumber;
+
+    /**
+     * 供应商
+     */
+    @ExcelProperty(value = "供应商")
+    private String supplier;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 }

+ 32 - 28
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirConfigurationVo.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain.vo;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.eco.als.domain.AirConfiguration;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -12,8 +13,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -28,62 +31,63 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = AirConfiguration.class)
 public class AirConfigurationVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 唯一ID */
+    /**
+     * 唯一ID
+     */
     @ExcelProperty(value = "唯一ID")
     private Long id;
 
-    /** 机型 */
+    /**
+     * 机型
+     */
     @ExcelProperty(value = "机型")
     private String aircraftType;
 
-    /** 构型编码 */
+    /**
+     * 构型编码
+     */
     @ExcelProperty(value = "构型编码")
     private String conCode;
 
-    /** 产品名称 */
+    /**
+     * 产品名称
+     */
     @ExcelProperty(value = "产品名称")
     private String name;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     @ExcelProperty(value = "规格型号")
     private String specsModel;
 
-    /** 图号 */
+    /**
+     * 图号
+     */
     @ExcelProperty(value = "图号")
     private String drawingNumber;
 
-    /** 供应商 */
+    /**
+     * 供应商
+     */
     @ExcelProperty(value = "供应商")
     private String supplier;
 
-    /** 描述 */
+    /**
+     * 描述
+     */
     @ExcelProperty(value = "描述")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 
-    /** 创建人 */
-    @ExcelProperty(value = "创建人")
-    private String createdBy;
-
-    /** 创建时间 */
-    @ExcelProperty(value = "创建时间")
-    private Date createdTime;
-
-    /** 更新人 */
-    @ExcelProperty(value = "更新人")
-    private String updatedBy;
-
-    /** 更新时间 */
-    @ExcelProperty(value = "更新时间")
-    private Date updatedTime;
-
-
     /**
      * 创建人名称
      */

+ 76 - 65
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallImportVo.java

@@ -1,14 +1,17 @@
 package org.eco.als.domain.vo;
 
-    import java.util.Date;
-    import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -27,69 +30,77 @@ public class AirInstallImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 航材编码 */
-                    @ExcelProperty(value = "航材编码")
-                private String materialCode;
-
-                /** 航材名称 */
-                    @ExcelProperty(value = "航材名称")
-                private String materialName;
-
-                /** 规格型号 */
-                    @ExcelProperty(value = "规格型号")
-                private String specsModel;
-
-                /** 图号 */
-                    @ExcelProperty(value = "图号")
-                private String drawingNumber;
-
-                /** 所属分类 */
-                    @ExcelProperty(value = "所属分类")
-                private String category;
-
-                /** 装机数量 */
-                    @ExcelProperty(value = "装机数量")
-                private String quantity;
-
-                /** 装机时间 */
-                    @ExcelProperty(value = "装机时间")
-                private String installTime;
-
-                /** 是否可修 */
-                    @ExcelProperty(value = "是否可修")
-                private String repairable;
-
-                /** 是否成套 */
-                    @ExcelProperty(value = "是否成套")
-                private String completeSet;
-
-                /** 是否有寿 */
-                    @ExcelProperty(value = "是否有寿")
-                private String serviceLife;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
-
-                /** 创建人 */
-                    @ExcelProperty(value = "创建人")
-                    private String createdBy;
-
-                /** 创建时间 */
-                    @ExcelProperty(value = "创建时间")
-                    private Date createdTime;
-
-                /** 更新人 */
-                    @ExcelProperty(value = "更新人")
-                    private String updatedBy;
-
-                /** 更新时间 */
-                    @ExcelProperty(value = "更新时间")
-                    private Date updatedTime;
+    /**
+     * 航材编码
+     */
+    @ExcelProperty(value = "航材编码")
+    private String materialCode;
+
+    /**
+     * 航材名称
+     */
+    @ExcelProperty(value = "航材名称")
+    private String materialName;
+
+    /**
+     * 规格型号
+     */
+    @ExcelProperty(value = "规格型号")
+    private String specsModel;
+
+    /**
+     * 图号
+     */
+    @ExcelProperty(value = "图号")
+    private String drawingNumber;
+
+    /**
+     * 所属分类
+     */
+    @ExcelProperty(value = "所属分类")
+    private String category;
+
+    /**
+     * 装机数量
+     */
+    @ExcelProperty(value = "装机数量")
+    private String quantity;
+
+    /**
+     * 装机时间
+     */
+    @ExcelProperty(value = "装机时间")
+    private String installTime;
+
+    /**
+     * 是否可修
+     */
+    @ExcelProperty(value = "是否可修")
+    private String repairable;
+
+    /**
+     * 是否成套
+     */
+    @ExcelProperty(value = "是否成套")
+    private String completeSet;
+
+    /**
+     * 是否有寿
+     */
+    @ExcelProperty(value = "是否有寿")
+    private String serviceLife;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 44 - 31
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallVo.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain.vo;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.eco.als.domain.AirInstall;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -12,8 +13,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -28,77 +31,87 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = AirInstall.class)
 public class AirInstallVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 唯一ID */
+    /**
+     * 唯一ID
+     */
     @ExcelProperty(value = "唯一ID")
     private Long id;
 
-    /** 航材编码 */
+    /**
+     * 航材编码
+     */
     @ExcelProperty(value = "航材编码")
     private String materialCode;
 
-    /** 航材名称 */
+    /**
+     * 航材名称
+     */
     @ExcelProperty(value = "航材名称")
     private String materialName;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     @ExcelProperty(value = "规格型号")
     private String specsModel;
 
-    /** 图号 */
+    /**
+     * 图号
+     */
     @ExcelProperty(value = "图号")
     private String drawingNumber;
 
-    /** 所属分类 */
+    /**
+     * 所属分类
+     */
     @ExcelProperty(value = "所属分类")
     private String category;
 
-    /** 装机数量 */
+    /**
+     * 装机数量
+     */
     @ExcelProperty(value = "装机数量")
     private String quantity;
 
-    /** 装机时间 */
+    /**
+     * 装机时间
+     */
     @ExcelProperty(value = "装机时间")
     private String installTime;
 
-    /** 是否可修 */
+    /**
+     * 是否可修
+     */
     @ExcelProperty(value = "是否可修")
     private String repairable;
 
-    /** 是否成套 */
+    /**
+     * 是否成套
+     */
     @ExcelProperty(value = "是否成套")
     private String completeSet;
 
-    /** 是否有寿 */
+    /**
+     * 是否有寿
+     */
     @ExcelProperty(value = "是否有寿")
     private String serviceLife;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 
-    /** 创建人 */
-    @ExcelProperty(value = "创建人")
-    private String createdBy;
-
-    /** 创建时间 */
-    @ExcelProperty(value = "创建时间")
-    private Date createdTime;
-
-    /** 更新人 */
-    @ExcelProperty(value = "更新人")
-    private String updatedBy;
-
-    /** 更新时间 */
-    @ExcelProperty(value = "更新时间")
-    private Date updatedTime;
-
 
     /**
      * 创建人名称

+ 55 - 35
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultCaseImportVo.java

@@ -5,8 +5,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,41 +27,59 @@ public class FaultCaseImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 机型 */
-                    @ExcelProperty(value = "机型")
-                private String aircraftType;
-
-                /** 故障代码 */
-                    @ExcelProperty(value = "故障代码")
-                private String faultCode;
-
-                /** 故障名称 */
-                    @ExcelProperty(value = "故障名称")
-                private String faultName;
-
-                /** 故障位置 */
-                    @ExcelProperty(value = "故障位置")
-                private String location;
-
-                /** 故障等级 */
-                    @ExcelProperty(value = "故障等级")
-                private String level;
-
-                /** 故障现象 */
-                    @ExcelProperty(value = "故障现象")
-                private String symptoms;
-
-                /** 故障原因 */
-                    @ExcelProperty(value = "故障原因")
-                private String faultCause;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 机型
+     */
+    @ExcelProperty(value = "机型")
+    private String aircraftType;
+
+    /**
+     * 故障代码
+     */
+    @ExcelProperty(value = "故障代码")
+    private String faultCode;
+
+    /**
+     * 故障名称
+     */
+    @ExcelProperty(value = "故障名称")
+    private String faultName;
+
+    /**
+     * 故障位置
+     */
+    @ExcelProperty(value = "故障位置")
+    private String location;
+
+    /**
+     * 故障等级
+     */
+    @ExcelProperty(value = "故障等级")
+    private String level;
+
+    /**
+     * 故障现象
+     */
+    @ExcelProperty(value = "故障现象")
+    private String symptoms;
+
+    /**
+     * 故障原因
+     */
+    @ExcelProperty(value = "故障原因")
+    private String faultCause;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 34 - 12
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultCaseVo.java

@@ -10,8 +10,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -26,46 +28,66 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = FaultCase.class)
 public class FaultCaseVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 机型 */
+    /**
+     * 机型
+     */
     @ExcelProperty(value = "机型")
     private String aircraftType;
 
-    /** 故障代码 */
+    /**
+     * 故障代码
+     */
     @ExcelProperty(value = "故障代码")
     private String faultCode;
 
-    /** 故障名称 */
+    /**
+     * 故障名称
+     */
     @ExcelProperty(value = "故障名称")
     private String faultName;
 
-    /** 故障位置 */
+    /**
+     * 故障位置
+     */
     @ExcelProperty(value = "故障位置")
     private String location;
 
-    /** 故障等级 */
+    /**
+     * 故障等级
+     */
     @ExcelProperty(value = "故障等级")
     private String level;
 
-    /** 故障现象 */
+    /**
+     * 故障现象
+     */
     @ExcelProperty(value = "故障现象")
     private String symptoms;
 
-    /** 故障原因 */
+    /**
+     * 故障原因
+     */
     @ExcelProperty(value = "故障原因")
     private String faultCause;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 31 - 19
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultConsumableImportVo.java

@@ -5,8 +5,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,25 +27,35 @@ public class FaultConsumableImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 耗材名称 */
-                    @ExcelProperty(value = "耗材名称")
-                private String consumableName;
-
-                /** 数量 */
-                    @ExcelProperty(value = "数量")
-                private Integer quantity;
-
-                /** 用途 */
-                    @ExcelProperty(value = "用途")
-                private String purpose;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 耗材名称
+     */
+    @ExcelProperty(value = "耗材名称")
+    private String consumableName;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private Integer quantity;
+
+    /**
+     * 用途
+     */
+    @ExcelProperty(value = "用途")
+    private String purpose;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 37 - 21
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultEquipmentImportVo.java

@@ -5,8 +5,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,33 +27,47 @@ public class FaultEquipmentImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 设备编号 */
-                    @ExcelProperty(value = "设备编号")
-                private String equipmentCode;
+    /**
+     * 设备编号
+     */
+    @ExcelProperty(value = "设备编号")
+    private String equipmentCode;
 
-                /** 设备名称 */
-                    @ExcelProperty(value = "设备名称")
-                private String equipmentName;
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String equipmentName;
 
-                /** 规格型号 */
-                    @ExcelProperty(value = "规格型号")
-                private String modelNumber;
+    /**
+     * 规格型号
+     */
+    @ExcelProperty(value = "规格型号")
+    private String modelNumber;
 
-                /** 数量 */
-                    @ExcelProperty(value = "数量")
-                private Integer quantity;
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private Integer quantity;
 
-                /** 用途 */
-                    @ExcelProperty(value = "用途")
-                private String purpose;
+    /**
+     * 用途
+     */
+    @ExcelProperty(value = "用途")
+    private String purpose;
 
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
 
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 19 - 7
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultNotesVo.java

@@ -10,8 +10,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -26,26 +28,36 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = FaultNotes.class)
 public class FaultNotesVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 注意内容 */
+    /**
+     * 注意内容
+     */
     @ExcelProperty(value = "注意内容")
     private String noteContent;
 
-    /** 图片 */
+    /**
+     * 图片
+     */
     @ExcelProperty(value = "图片")
     private String image;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 25 - 9
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultPersonnelVo.java

@@ -10,8 +10,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -26,34 +28,48 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = FaultPersonnel.class)
 public class FaultPersonnelVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 人员 */
+    /**
+     * 人员
+     */
     @ExcelProperty(value = "人员")
     private String personnel;
 
-    /** 岗位 */
+    /**
+     * 岗位
+     */
     @ExcelProperty(value = "岗位")
     private String position;
 
-    /** 数量 */
+    /**
+     * 数量
+     */
     @ExcelProperty(value = "数量")
     private Integer quantity;
 
-    /** 职责 */
+    /**
+     * 职责
+     */
     @ExcelProperty(value = "职责")
     private String duties;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 31 - 19
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSetpsImportVo.java

@@ -5,8 +5,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,25 +27,35 @@ public class FaultSetpsImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 操作步骤 */
-                    @ExcelProperty(value = "操作步骤")
-                private Integer setps;
-
-                /** 操作方法 */
-                    @ExcelProperty(value = "操作方法")
-                private String method;
-
-                /** 图片 */
-                    @ExcelProperty(value = "图片")
-                private String image;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 操作步骤
+     */
+    @ExcelProperty(value = "操作步骤")
+    private Integer setps;
+
+    /**
+     * 操作方法
+     */
+    @ExcelProperty(value = "操作方法")
+    private String method;
+
+    /**
+     * 图片
+     */
+    @ExcelProperty(value = "图片")
+    private String image;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 37 - 21
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSparePartsImportVo.java

@@ -5,8 +5,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,33 +27,47 @@ public class FaultSparePartsImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 备件编号 */
-                    @ExcelProperty(value = "备件编号")
-                private String sparePartsCode;
+    /**
+     * 备件编号
+     */
+    @ExcelProperty(value = "备件编号")
+    private String sparePartsCode;
 
-                /** 备件名称 */
-                    @ExcelProperty(value = "备件名称")
-                private String sparePartsName;
+    /**
+     * 备件名称
+     */
+    @ExcelProperty(value = "备件名称")
+    private String sparePartsName;
 
-                /** 规格型号 */
-                    @ExcelProperty(value = "规格型号")
-                private String modelNumber;
+    /**
+     * 规格型号
+     */
+    @ExcelProperty(value = "规格型号")
+    private String modelNumber;
 
-                /** 数量 */
-                    @ExcelProperty(value = "数量")
-                private Integer quantity;
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private Integer quantity;
 
-                /** 用途 */
-                    @ExcelProperty(value = "用途")
-                private String purpose;
+    /**
+     * 用途
+     */
+    @ExcelProperty(value = "用途")
+    private String purpose;
 
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
 
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 28 - 10
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultSparePartsVo.java

@@ -10,8 +10,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -26,38 +28,54 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = FaultSpareParts.class)
 public class FaultSparePartsVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 备件编号 */
+    /**
+     * 备件编号
+     */
     @ExcelProperty(value = "备件编号")
     private String sparePartsCode;
 
-    /** 备件名称 */
+    /**
+     * 备件名称
+     */
     @ExcelProperty(value = "备件名称")
     private String sparePartsName;
 
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     @ExcelProperty(value = "规格型号")
     private String modelNumber;
 
-    /** 数量 */
+    /**
+     * 数量
+     */
     @ExcelProperty(value = "数量")
     private Integer quantity;
 
-    /** 用途 */
+    /**
+     * 用途
+     */
     @ExcelProperty(value = "用途")
     private String purpose;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 124 - 82
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceImportVo.java

@@ -1,12 +1,14 @@
 package org.eco.als.domain.vo;
 
-    import java.util.Date;
+import java.util.Date;
 
-    import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-    import lombok.Data;
+import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -25,85 +27,125 @@ public class MaintenanceImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 飞机编码 */
-                    @ExcelProperty(value = "飞机编码")
-                private String aircraftCode;
-
-                /** 故障代码 */
-                    @ExcelProperty(value = "故障代码")
-                private String faultCode;
-
-                /** 故障名称 */
-                    @ExcelProperty(value = "故障名称")
-                private String faultName;
-
-                /** 故障位置 */
-                    @ExcelProperty(value = "故障位置")
-                private String location;
-
-                /** 故障等级 */
-                    @ExcelProperty(value = "故障等级")
-                private String level;
-
-                /** 故障发生时间 */
-                    @ExcelProperty(value = "故障发生时间")
-                private Date faultDate;
-
-                /** 故障现象 */
-                    @ExcelProperty(value = "故障现象")
-                private String symptoms;
-
-                /** 故障原因 */
-                    @ExcelProperty(value = "故障原因")
-                private String faultCause;
-
-                /** 维修结果 */
-                    @ExcelProperty(value = "维修结果")
-                private String status;
-
-                /** 维修负责人 */
-                    @ExcelProperty(value = "维修负责人")
-                private String supervisor;
-
-                /** 维修时间 */
-                    @ExcelProperty(value = "维修时间")
-                private Date maintenanceTime;
-
-                /** 换件前器材编码 */
-                    @ExcelProperty(value = "换件前器材编码")
-                private String beforeEquipmentCode;
-
-                /** 换件前器材名称 */
-                    @ExcelProperty(value = "换件前器材名称")
-                private String beforeEquipmentName;
-
-                /** 换件前规格型号 */
-                    @ExcelProperty(value = "换件前规格型号")
-                private String beforeModelNumber;
-
-                /** 换件后器材编码 */
-                    @ExcelProperty(value = "换件后器材编码")
-                private String afterEquipmentCode;
-
-                /** 换件后器材名称 */
-                    @ExcelProperty(value = "换件后器材名称")
-                private String afterEquipmentName;
-
-                /** 换件后规格型号 */
-                    @ExcelProperty(value = "换件后规格型号")
-                private String afterModelNumber;
-
-                /** 更换数量 */
-                    @ExcelProperty(value = "更换数量")
-                private String quantity;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 飞机编码
+     */
+    @ExcelProperty(value = "飞机编码")
+    private String aircraftCode;
+
+    /**
+     * 故障代码
+     */
+    @ExcelProperty(value = "故障代码")
+    private String faultCode;
+
+    /**
+     * 故障名称
+     */
+    @ExcelProperty(value = "故障名称")
+    private String faultName;
+
+    /**
+     * 故障位置
+     */
+    @ExcelProperty(value = "故障位置")
+    private String location;
+
+    /**
+     * 故障等级
+     */
+    @ExcelProperty(value = "故障等级")
+    private String level;
+
+    /**
+     * 故障发生时间
+     */
+    @ExcelProperty(value = "故障发生时间")
+    private Date faultDate;
+
+    /**
+     * 故障现象
+     */
+    @ExcelProperty(value = "故障现象")
+    private String symptoms;
+
+    /**
+     * 故障原因
+     */
+    @ExcelProperty(value = "故障原因")
+    private String faultCause;
+
+    /**
+     * 维修结果
+     */
+    @ExcelProperty(value = "维修结果")
+    private String status;
+
+    /**
+     * 维修负责人
+     */
+    @ExcelProperty(value = "维修负责人")
+    private String supervisor;
+
+    /**
+     * 维修时间
+     */
+    @ExcelProperty(value = "维修时间")
+    private Date maintenanceTime;
+
+    /**
+     * 换件前器材编码
+     */
+    @ExcelProperty(value = "换件前器材编码")
+    private String beforeEquipmentCode;
+
+    /**
+     * 换件前器材名称
+     */
+    @ExcelProperty(value = "换件前器材名称")
+    private String beforeEquipmentName;
+
+    /**
+     * 换件前规格型号
+     */
+    @ExcelProperty(value = "换件前规格型号")
+    private String beforeModelNumber;
+
+    /**
+     * 换件后器材编码
+     */
+    @ExcelProperty(value = "换件后器材编码")
+    private String afterEquipmentCode;
+
+    /**
+     * 换件后器材名称
+     */
+    @ExcelProperty(value = "换件后器材名称")
+    private String afterEquipmentName;
+
+    /**
+     * 换件后规格型号
+     */
+    @ExcelProperty(value = "换件后规格型号")
+    private String afterModelNumber;
+
+    /**
+     * 更换数量
+     */
+    @ExcelProperty(value = "更换数量")
+    private String quantity;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 67 - 23
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceVo.java

@@ -10,8 +10,10 @@ import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -26,90 +28,132 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = Maintenance.class)
 public class MaintenanceVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 飞机编码 */
+    /**
+     * 飞机编码
+     */
     @ExcelProperty(value = "飞机编码")
     private String aircraftCode;
 
-    /** 故障代码 */
+    /**
+     * 故障代码
+     */
     @ExcelProperty(value = "故障代码")
     private String faultCode;
 
-    /** 故障名称 */
+    /**
+     * 故障名称
+     */
     @ExcelProperty(value = "故障名称")
     private String faultName;
 
-    /** 故障位置 */
+    /**
+     * 故障位置
+     */
     @ExcelProperty(value = "故障位置")
     private String location;
 
-    /** 故障等级 */
+    /**
+     * 故障等级
+     */
     @ExcelProperty(value = "故障等级")
     private String level;
 
-    /** 故障发生时间 */
+    /**
+     * 故障发生时间
+     */
     @ExcelProperty(value = "故障发生时间")
     private Date faultDate;
 
-    /** 故障现象 */
+    /**
+     * 故障现象
+     */
     @ExcelProperty(value = "故障现象")
     private String symptoms;
 
-    /** 故障原因 */
+    /**
+     * 故障原因
+     */
     @ExcelProperty(value = "故障原因")
     private String faultCause;
 
-    /** 维修结果 */
+    /**
+     * 维修结果
+     */
     @ExcelProperty(value = "维修结果")
     private String status;
 
-    /** 维修负责人 */
+    /**
+     * 维修负责人
+     */
     @ExcelProperty(value = "维修负责人")
     private String supervisor;
 
-    /** 维修时间 */
+    /**
+     * 维修时间
+     */
     @ExcelProperty(value = "维修时间")
     private Date maintenanceTime;
 
-    /** 换件前器材编码 */
+    /**
+     * 换件前器材编码
+     */
     @ExcelProperty(value = "换件前器材编码")
     private String beforeEquipmentCode;
 
-    /** 换件前器材名称 */
+    /**
+     * 换件前器材名称
+     */
     @ExcelProperty(value = "换件前器材名称")
     private String beforeEquipmentName;
 
-    /** 换件前规格型号 */
+    /**
+     * 换件前规格型号
+     */
     @ExcelProperty(value = "换件前规格型号")
     private String beforeModelNumber;
 
-    /** 换件后器材编码 */
+    /**
+     * 换件后器材编码
+     */
     @ExcelProperty(value = "换件后器材编码")
     private String afterEquipmentCode;
 
-    /** 换件后器材名称 */
+    /**
+     * 换件后器材名称
+     */
     @ExcelProperty(value = "换件后器材名称")
     private String afterEquipmentName;
 
-    /** 换件后规格型号 */
+    /**
+     * 换件后规格型号
+     */
     @ExcelProperty(value = "换件后规格型号")
     private String afterModelNumber;
 
-    /** 更换数量 */
+    /**
+     * 更换数量
+     */
     @ExcelProperty(value = "更换数量")
     private String quantity;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @ExcelProperty(value = "备注")
     private String remarks;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 61 - 39
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/PartReplacementImportVo.java

@@ -3,8 +3,10 @@ package org.eco.als.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
+
 import lombok.NoArgsConstructor;
 
 /**
@@ -23,45 +25,65 @@ public class PartReplacementImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 飞机编码 */
-                    @ExcelProperty(value = "飞机编码")
-                private String aircraftCode;
-
-                /** 换件前器材编码 */
-                    @ExcelProperty(value = "换件前器材编码")
-                private String beforeEquipmentCode;
-
-                /** 换件前器材名称 */
-                    @ExcelProperty(value = "换件前器材名称")
-                private String beforeEquipmentName;
-
-                /** 换件前规格型号 */
-                    @ExcelProperty(value = "换件前规格型号")
-                private String beforeModelNumber;
-
-                /** 换件后器材编码 */
-                    @ExcelProperty(value = "换件后器材编码")
-                private String afterEquipmentCode;
-
-                /** 换件后器材名称 */
-                    @ExcelProperty(value = "换件后器材名称")
-                private String afterEquipmentName;
-
-                /** 换件后规格型号 */
-                    @ExcelProperty(value = "换件后规格型号")
-                private String afterModelNumber;
-
-                /** 更换数量 */
-                    @ExcelProperty(value = "更换数量")
-                private String quantity;
-
-                /** 备注 */
-                    @ExcelProperty(value = "备注")
-                private String remarks;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 飞机编码
+     */
+    @ExcelProperty(value = "飞机编码")
+    private String aircraftCode;
+
+    /**
+     * 换件前器材编码
+     */
+    @ExcelProperty(value = "换件前器材编码")
+    private String beforeEquipmentCode;
+
+    /**
+     * 换件前器材名称
+     */
+    @ExcelProperty(value = "换件前器材名称")
+    private String beforeEquipmentName;
+
+    /**
+     * 换件前规格型号
+     */
+    @ExcelProperty(value = "换件前规格型号")
+    private String beforeModelNumber;
+
+    /**
+     * 换件后器材编码
+     */
+    @ExcelProperty(value = "换件后器材编码")
+    private String afterEquipmentCode;
+
+    /**
+     * 换件后器材名称
+     */
+    @ExcelProperty(value = "换件后器材名称")
+    private String afterEquipmentName;
+
+    /**
+     * 换件后规格型号
+     */
+    @ExcelProperty(value = "换件后规格型号")
+    private String afterModelNumber;
+
+    /**
+     * 更换数量
+     */
+    @ExcelProperty(value = "更换数量")
+    private String quantity;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/AirConfigurationImportListener.java

@@ -84,6 +84,7 @@ public class AirConfigurationImportListener extends AnalysisEventListener<AirCon
             log.error(msg, e);
         }
     }
+
     private void setBo(AirConfigurationBo airConfigurationBo) {
         airConfigurationBo.setVersion(0);
         airConfigurationBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/AirInstallImportListener.java

@@ -84,6 +84,7 @@ public class AirInstallImportListener extends AnalysisEventListener<AirInstallIm
             log.error(msg, e);
         }
     }
+
     private void setBo(AirInstallBo airInstallBo) {
         airInstallBo.setVersion(0);
         airInstallBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultCaseImportListener.java

@@ -84,6 +84,7 @@ public class FaultCaseImportListener extends AnalysisEventListener<FaultCaseImpo
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultCaseBo faultCaseBo) {
         faultCaseBo.setVersion(0);
         faultCaseBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultConsumableImportListener.java

@@ -84,6 +84,7 @@ public class FaultConsumableImportListener extends AnalysisEventListener<FaultCo
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultConsumableBo faultConsumableBo) {
         faultConsumableBo.setVersion(0);
         faultConsumableBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultEquipmentImportListener.java

@@ -84,6 +84,7 @@ public class FaultEquipmentImportListener extends AnalysisEventListener<FaultEqu
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultEquipmentBo faultEquipmentBo) {
         faultEquipmentBo.setVersion(0);
         faultEquipmentBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultNotesImportListener.java

@@ -84,6 +84,7 @@ public class FaultNotesImportListener extends AnalysisEventListener<FaultNotesIm
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultNotesBo faultNotesBo) {
         faultNotesBo.setVersion(0);
         faultNotesBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultPersonnelImportListener.java

@@ -84,6 +84,7 @@ public class FaultPersonnelImportListener extends AnalysisEventListener<FaultPer
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultPersonnelBo faultPersonnelBo) {
         faultPersonnelBo.setVersion(0);
         faultPersonnelBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultSetpsImportListener.java

@@ -84,6 +84,7 @@ public class FaultSetpsImportListener extends AnalysisEventListener<FaultSetpsIm
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultSetpsBo faultSetpsBo) {
         faultSetpsBo.setVersion(0);
         faultSetpsBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultSparePartsImportListener.java

@@ -84,6 +84,7 @@ public class FaultSparePartsImportListener extends AnalysisEventListener<FaultSp
             log.error(msg, e);
         }
     }
+
     private void setBo(FaultSparePartsBo faultSparePartsBo) {
         faultSparePartsBo.setVersion(0);
         faultSparePartsBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/MaintenanceImportListener.java

@@ -84,6 +84,7 @@ public class MaintenanceImportListener extends AnalysisEventListener<Maintenance
             log.error(msg, e);
         }
     }
+
     private void setBo(MaintenanceBo maintenanceBo) {
         maintenanceBo.setVersion(0);
         maintenanceBo.setCreateBy(loginUser.getUserId());

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/listener/PartReplacementImportListener.java

@@ -84,6 +84,7 @@ public class PartReplacementImportListener extends AnalysisEventListener<PartRep
             log.error(msg, e);
         }
     }
+
     private void setBo(PartReplacementBo partReplacementBo) {
         partReplacementBo.setVersion(0);
         partReplacementBo.setCreateBy(loginUser.getUserId());

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IAirConfigurationService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.AirConfiguration;
 import org.eco.als.domain.vo.AirConfigurationVo;
@@ -23,7 +24,8 @@ public interface IAirConfigurationService extends IBaseService<AirConfiguration>
      * @param id 飞机构型主键
      * @return 飞机构型
      */
-        AirConfigurationVo selectById(Long id);
+    AirConfigurationVo selectById(Long id);
+
     /**
      * 查询飞机构型列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IAirInstallService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.AirInstall;
 import org.eco.als.domain.vo.AirInstallVo;
@@ -23,7 +24,8 @@ public interface IAirInstallService extends IBaseService<AirInstall> {
      * @param id 装机信息主键
      * @return 装机信息
      */
-        AirInstallVo selectById(Long id);
+    AirInstallVo selectById(Long id);
+
     /**
      * 查询装机信息列表
      *

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/service/IAlgorithmService.java

@@ -12,6 +12,7 @@ public interface IAlgorithmService {
     String executePro(AlgorithmBo algorithmBo);
 
     String executeFalseAlarm(AlgorithmBo algorithmBo);
+
     String executeFault(AlgorithmBo algorithmBo);
 
     String batchExecute(TaskBo taskBo);

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultCaseService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultCase;
 import org.eco.als.domain.vo.FaultCaseVo;
@@ -23,7 +24,8 @@ public interface IFaultCaseService extends IBaseService<FaultCase> {
      * @param id 故障案例主键
      * @return 故障案例
      */
-        FaultCaseVo selectById(Long id);
+    FaultCaseVo selectById(Long id);
+
     /**
      * 查询故障案例列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultConsumableService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultConsumable;
 import org.eco.als.domain.vo.FaultConsumableVo;
@@ -23,7 +24,8 @@ public interface IFaultConsumableService extends IBaseService<FaultConsumable> {
      * @param id 故障所需耗材主键
      * @return 故障所需耗材
      */
-        FaultConsumableVo selectById(Long id);
+    FaultConsumableVo selectById(Long id);
+
     /**
      * 查询故障所需耗材列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultEquipmentService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultEquipment;
 import org.eco.als.domain.vo.FaultEquipmentVo;
@@ -23,7 +24,8 @@ public interface IFaultEquipmentService extends IBaseService<FaultEquipment> {
      * @param id 故障所需设备主键
      * @return 故障所需设备
      */
-        FaultEquipmentVo selectById(Long id);
+    FaultEquipmentVo selectById(Long id);
+
     /**
      * 查询故障所需设备列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultNotesService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultNotes;
 import org.eco.als.domain.vo.FaultNotesVo;
@@ -23,7 +24,8 @@ public interface IFaultNotesService extends IBaseService<FaultNotes> {
      * @param id 故障注意事项主键
      * @return 故障注意事项
      */
-        FaultNotesVo selectById(Long id);
+    FaultNotesVo selectById(Long id);
+
     /**
      * 查询故障注意事项列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultPersonnelService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultPersonnel;
 import org.eco.als.domain.vo.FaultPersonnelVo;
@@ -23,7 +24,8 @@ public interface IFaultPersonnelService extends IBaseService<FaultPersonnel> {
      * @param id 故障操作人员主键
      * @return 故障操作人员
      */
-        FaultPersonnelVo selectById(Long id);
+    FaultPersonnelVo selectById(Long id);
+
     /**
      * 查询故障操作人员列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultSetpsService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultSetps;
 import org.eco.als.domain.vo.FaultSetpsVo;
@@ -23,7 +24,8 @@ public interface IFaultSetpsService extends IBaseService<FaultSetps> {
      * @param id 故障操作步骤主键
      * @return 故障操作步骤
      */
-        FaultSetpsVo selectById(Long id);
+    FaultSetpsVo selectById(Long id);
+
     /**
      * 查询故障操作步骤列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultSparePartsService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultSpareParts;
 import org.eco.als.domain.vo.FaultSparePartsVo;
@@ -23,7 +24,8 @@ public interface IFaultSparePartsService extends IBaseService<FaultSpareParts> {
      * @param id 故障所需备件主键
      * @return 故障所需备件
      */
-        FaultSparePartsVo selectById(Long id);
+    FaultSparePartsVo selectById(Long id);
+
     /**
      * 查询故障所需备件列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IMaintenanceService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.Maintenance;
 import org.eco.als.domain.vo.MaintenanceVo;
@@ -23,7 +24,8 @@ public interface IMaintenanceService extends IBaseService<Maintenance> {
      * @param id 维修信息主键
      * @return 维修信息
      */
-        MaintenanceVo selectById(Long id);
+    MaintenanceVo selectById(Long id);
+
     /**
      * 查询维修信息列表
      *

+ 3 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/service/IPartReplacementService.java

@@ -1,6 +1,7 @@
 package org.eco.als.service;
 
 import java.util.List;
+
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.PartReplacement;
 import org.eco.als.domain.vo.PartReplacementVo;
@@ -23,7 +24,8 @@ public interface IPartReplacementService extends IBaseService<PartReplacement> {
      * @param id 换件记录主键
      * @return 换件记录
      */
-        PartReplacementVo selectById(Long id);
+    PartReplacementVo selectById(Long id);
+
     /**
      * 查询换件记录列表
      *

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/service/ITaskService.java

@@ -73,6 +73,7 @@ public interface ITaskService extends IBaseService<Task> {
      * @return 结果:true 删除成功,false 删除失败
      */
     boolean deleteByIds(Long[] ids);
+
     /**
      * asyncExport 异步导出
      *

+ 19 - 17
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AirConfigurationServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.AirConfigurationMapper;
 import org.eco.als.domain.AirConfiguration;
 import org.eco.als.domain.bo.AirConfigurationBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.AirConfigurationVo;
 import org.eco.als.domain.vo.AirConfigurationImportVo;
 import org.eco.als.listener.AirConfigurationImportListener;
 import org.eco.als.service.IAirConfigurationService;
+
 import static org.eco.als.domain.table.AirConfigurationTableDef.AIR_CONFIGURATION;
 
 /**
@@ -58,19 +61,19 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
     private QueryWrapper buildQueryWrapper(AirConfigurationBo airConfigurationBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(AIR_CONFIGURATION.AIRCRAFT_TYPE.eq
-        (airConfigurationBo.getAircraftType()));
+            (airConfigurationBo.getAircraftType()));
         queryWrapper.and(AIR_CONFIGURATION.CON_CODE.eq
-        (airConfigurationBo.getConCode()));
+            (airConfigurationBo.getConCode()));
         queryWrapper.and(AIR_CONFIGURATION.NAME.like
-        (airConfigurationBo.getName()));
+            (airConfigurationBo.getName()));
         queryWrapper.and(AIR_CONFIGURATION.SPECS_MODEL.eq
-        (airConfigurationBo.getSpecsModel()));
+            (airConfigurationBo.getSpecsModel()));
         queryWrapper.and(AIR_CONFIGURATION.DRAWING_NUMBER.eq
-        (airConfigurationBo.getDrawingNumber()));
+            (airConfigurationBo.getDrawingNumber()));
         queryWrapper.and(AIR_CONFIGURATION.SUPPLIER.eq
-        (airConfigurationBo.getSupplier()));
+            (airConfigurationBo.getSupplier()));
         queryWrapper.and(AIR_CONFIGURATION.REMARKS.eq
-        (airConfigurationBo.getRemarks()));
+            (airConfigurationBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -83,7 +86,7 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
      */
     @Override
     public AirConfigurationVo selectById(Long id) {
-            return this.getOneAs(query().where(AIR_CONFIGURATION.ID.eq(id)), AirConfigurationVo.class);
+        return this.getOneAs(query().where(AIR_CONFIGURATION.ID.eq(id)), AirConfigurationVo.class);
 
     }
 
@@ -97,7 +100,7 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
     @Override
     public List<AirConfigurationVo> selectList(AirConfigurationBo airConfigurationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(airConfigurationBo);
-            return this.listAs(queryWrapper, AirConfigurationVo.class);
+        return this.listAs(queryWrapper, AirConfigurationVo.class);
     }
 
     /**
@@ -109,7 +112,7 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
     @Override
     public PageResult<AirConfigurationVo> selectPage(AirConfigurationBo airConfigurationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(airConfigurationBo);
-            Page<AirConfigurationVo> page = this.pageAs(PageQuery.build(), queryWrapper, AirConfigurationVo.class);
+        Page<AirConfigurationVo> page = this.pageAs(PageQuery.build(), queryWrapper, AirConfigurationVo.class);
         return PageResult.build(page);
     }
 
@@ -121,7 +124,7 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
      */
     @Override
     public boolean insert(AirConfigurationBo airConfigurationBo) {
-    AirConfiguration airConfiguration =MapstructUtils.convert(airConfigurationBo, AirConfiguration. class);
+        AirConfiguration airConfiguration = MapstructUtils.convert(airConfigurationBo, AirConfiguration.class);
 
         return this.save(airConfiguration);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -133,12 +136,11 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(AirConfigurationBo airConfigurationBo)
-    {
+    public boolean insertWithPk(AirConfigurationBo airConfigurationBo) {
         AirConfiguration airConfiguration = MapstructUtils.convert(airConfigurationBo, AirConfiguration.class);
 
 
-            return airConfigurationMapper.insertWithPk(airConfiguration) > 0;//前台传来主键值
+        return airConfigurationMapper.insertWithPk(airConfiguration) > 0;//前台传来主键值
     }
 
     /**
@@ -149,10 +151,10 @@ public class AirConfigurationServiceImpl extends BaseServiceImpl<AirConfiguratio
      */
     @Override
     public boolean update(AirConfigurationBo airConfigurationBo) {
-        AirConfiguration airConfiguration =MapstructUtils.convert(airConfigurationBo, AirConfiguration. class);
-        if (ObjectUtil.isNotNull(airConfiguration) && ObjectUtil.isNotNull(airConfiguration.getId())){
+        AirConfiguration airConfiguration = MapstructUtils.convert(airConfigurationBo, AirConfiguration.class);
+        if (ObjectUtil.isNotNull(airConfiguration) && ObjectUtil.isNotNull(airConfiguration.getId())) {
             boolean updated = this.updateById(airConfiguration);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 23 - 21
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AirInstallServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.AirInstallMapper;
 import org.eco.als.domain.AirInstall;
 import org.eco.als.domain.bo.AirInstallBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.AirInstallVo;
 import org.eco.als.domain.vo.AirInstallImportVo;
 import org.eco.als.listener.AirInstallImportListener;
 import org.eco.als.service.IAirInstallService;
+
 import static org.eco.als.domain.table.AirInstallTableDef.AIR_INSTALL;
 
 /**
@@ -58,27 +61,27 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
     private QueryWrapper buildQueryWrapper(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(AIR_INSTALL.MATERIAL_CODE.eq
-        (airInstallBo.getMaterialCode()));
+            (airInstallBo.getMaterialCode()));
         queryWrapper.and(AIR_INSTALL.MATERIAL_NAME.like
-        (airInstallBo.getMaterialName()));
+            (airInstallBo.getMaterialName()));
         queryWrapper.and(AIR_INSTALL.SPECS_MODEL.eq
-        (airInstallBo.getSpecsModel()));
+            (airInstallBo.getSpecsModel()));
         queryWrapper.and(AIR_INSTALL.DRAWING_NUMBER.eq
-        (airInstallBo.getDrawingNumber()));
+            (airInstallBo.getDrawingNumber()));
         queryWrapper.and(AIR_INSTALL.CATEGORY.eq
-        (airInstallBo.getCategory()));
+            (airInstallBo.getCategory()));
         queryWrapper.and(AIR_INSTALL.QUANTITY.eq
-        (airInstallBo.getQuantity()));
+            (airInstallBo.getQuantity()));
         queryWrapper.and(AIR_INSTALL.INSTALL_TIME.eq
-        (airInstallBo.getInstallTime()));
+            (airInstallBo.getInstallTime()));
         queryWrapper.and(AIR_INSTALL.REPAIRABLE.eq
-        (airInstallBo.getRepairable()));
+            (airInstallBo.getRepairable()));
         queryWrapper.and(AIR_INSTALL.COMPLETE_SET.eq
-        (airInstallBo.getCompleteSet()));
+            (airInstallBo.getCompleteSet()));
         queryWrapper.and(AIR_INSTALL.SERVICE_LIFE.eq
-        (airInstallBo.getServiceLife()));
+            (airInstallBo.getServiceLife()));
         queryWrapper.and(AIR_INSTALL.REMARKS.eq
-        (airInstallBo.getRemarks()));
+            (airInstallBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -91,7 +94,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
      */
     @Override
     public AirInstallVo selectById(Long id) {
-            return this.getOneAs(query().where(AIR_INSTALL.ID.eq(id)), AirInstallVo.class);
+        return this.getOneAs(query().where(AIR_INSTALL.ID.eq(id)), AirInstallVo.class);
 
     }
 
@@ -105,7 +108,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
     @Override
     public List<AirInstallVo> selectList(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(airInstallBo);
-            return this.listAs(queryWrapper, AirInstallVo.class);
+        return this.listAs(queryWrapper, AirInstallVo.class);
     }
 
     /**
@@ -117,7 +120,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
     @Override
     public PageResult<AirInstallVo> selectPage(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(airInstallBo);
-            Page<AirInstallVo> page = this.pageAs(PageQuery.build(), queryWrapper, AirInstallVo.class);
+        Page<AirInstallVo> page = this.pageAs(PageQuery.build(), queryWrapper, AirInstallVo.class);
         return PageResult.build(page);
     }
 
@@ -129,7 +132,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
      */
     @Override
     public boolean insert(AirInstallBo airInstallBo) {
-    AirInstall airInstall =MapstructUtils.convert(airInstallBo, AirInstall. class);
+        AirInstall airInstall = MapstructUtils.convert(airInstallBo, AirInstall.class);
 
         return this.save(airInstall);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -141,12 +144,11 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(AirInstallBo airInstallBo)
-    {
+    public boolean insertWithPk(AirInstallBo airInstallBo) {
         AirInstall airInstall = MapstructUtils.convert(airInstallBo, AirInstall.class);
 
 
-            return airInstallMapper.insertWithPk(airInstall) > 0;//前台传来主键值
+        return airInstallMapper.insertWithPk(airInstall) > 0;//前台传来主键值
     }
 
     /**
@@ -157,10 +159,10 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
      */
     @Override
     public boolean update(AirInstallBo airInstallBo) {
-        AirInstall airInstall =MapstructUtils.convert(airInstallBo, AirInstall. class);
-        if (ObjectUtil.isNotNull(airInstall) && ObjectUtil.isNotNull(airInstall.getId())){
+        AirInstall airInstall = MapstructUtils.convert(airInstallBo, AirInstall.class);
+        if (ObjectUtil.isNotNull(airInstall) && ObjectUtil.isNotNull(airInstall.getId())) {
             boolean updated = this.updateById(airInstall);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 32 - 32
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java

@@ -105,15 +105,15 @@ public class AlgorithmService implements IAlgorithmService {
             return null;
         }
         PreProcessingBo processingBo =
-                PreProcessingBo.builder()
-                        .ossId(sysOssVo.getOssId())
-                        .aircraftId(algorithmBo.getAircraftId())
-                        .modelType(modelVo.getType())
-                        .sortieNo(algorithmBo.getSortieNo())
-                        .param(algorithmBo.getParam())
-                        .status("0")
-                        .columnData(Arrays.toString(algorithmBo.getColumnData()))
-                        .build();
+            PreProcessingBo.builder()
+                .ossId(sysOssVo.getOssId())
+                .aircraftId(algorithmBo.getAircraftId())
+                .modelType(modelVo.getType())
+                .sortieNo(algorithmBo.getSortieNo())
+                .param(algorithmBo.getParam())
+                .status("0")
+                .columnData(Arrays.toString(algorithmBo.getColumnData()))
+                .build();
         processingService.insert(processingBo);
         // 参数
         Map<String, Object> map = new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
@@ -152,14 +152,14 @@ public class AlgorithmService implements IAlgorithmService {
             return null;
         }
         FalseAlarmBo falseAlarmBo = FalseAlarmBo.builder()
-                .ossId(sysOssVo.getOssId())
-                .aircraftId(algorithmBo.getAircraftId())
-                .modelType(modelVo.getType())
-                .sortieNo(algorithmBo.getSortieNo())
-                .param(algorithmBo.getParam())
-                .status("0")
-                .columnData(Arrays.toString(algorithmBo.getColumnData()))
-                .build();
+            .ossId(sysOssVo.getOssId())
+            .aircraftId(algorithmBo.getAircraftId())
+            .modelType(modelVo.getType())
+            .sortieNo(algorithmBo.getSortieNo())
+            .param(algorithmBo.getParam())
+            .status("0")
+            .columnData(Arrays.toString(algorithmBo.getColumnData()))
+            .build();
         falseAlarmService.insert(falseAlarmBo);
 
         // 警告列表
@@ -176,13 +176,13 @@ public class AlgorithmService implements IAlgorithmService {
             falseAlarmBo.setStatus("1");
             falseAlarmService.update(falseAlarmBo);
             FalseAlarmResultBo falseAlarmResultBo = FalseAlarmResultBo.builder()
-                    .falseAlarmId(falseAlarmBo.getId())
-                    .code(warning.getCode())
-                    .name(warning.getName())
-                    .aircraftId(warning.getAircraftId())
-                    .sortieNo(warning.getSortieNo())
-                    .status(httpVo.getData())
-                    .build();
+                .falseAlarmId(falseAlarmBo.getId())
+                .code(warning.getCode())
+                .name(warning.getName())
+                .aircraftId(warning.getAircraftId())
+                .sortieNo(warning.getSortieNo())
+                .status(httpVo.getData())
+                .build();
             falseAlarmResultService.insert(falseAlarmResultBo);
         }
         return httpVo != null ? httpVo.getData() : null;
@@ -207,14 +207,14 @@ public class AlgorithmService implements IAlgorithmService {
             return null;
         }
         FaultDiagnosisBo diagnosisBo = FaultDiagnosisBo.builder()
-                .ossId(sysOssVo.getOssId())
-                .aircraftId(algorithmBo.getAircraftId())
-                .modelType(modelVo.getType())
-                .sortieNo(algorithmBo.getSortieNo())
-                .param(algorithmBo.getParam())
-                .status("0")
-                .columnData(Arrays.toString(algorithmBo.getColumnData()))
-                .build();
+            .ossId(sysOssVo.getOssId())
+            .aircraftId(algorithmBo.getAircraftId())
+            .modelType(modelVo.getType())
+            .sortieNo(algorithmBo.getSortieNo())
+            .param(algorithmBo.getParam())
+            .status("0")
+            .columnData(Arrays.toString(algorithmBo.getColumnData()))
+            .build();
         faultDiagnosisService.insert(diagnosisBo);
         // 参数
         Map<String, Object> map = new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));

+ 20 - 18
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultCaseServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultCaseMapper;
 import org.eco.als.domain.FaultCase;
 import org.eco.als.domain.bo.FaultCaseBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultCaseVo;
 import org.eco.als.domain.vo.FaultCaseImportVo;
 import org.eco.als.listener.FaultCaseImportListener;
 import org.eco.als.service.IFaultCaseService;
+
 import static org.eco.als.domain.table.FaultCaseTableDef.FAULT_CASE;
 
 /**
@@ -58,21 +61,21 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     private QueryWrapper buildQueryWrapper(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE.eq
-        (faultCaseBo.getAircraftType()));
+            (faultCaseBo.getAircraftType()));
         queryWrapper.and(FAULT_CASE.FAULT_CODE.eq
-        (faultCaseBo.getFaultCode()));
+            (faultCaseBo.getFaultCode()));
         queryWrapper.and(FAULT_CASE.FAULT_NAME.like
-        (faultCaseBo.getFaultName()));
+            (faultCaseBo.getFaultName()));
         queryWrapper.and(FAULT_CASE.LOCATION.eq
-        (faultCaseBo.getLocation()));
+            (faultCaseBo.getLocation()));
         queryWrapper.and(FAULT_CASE.LEVEL.eq
-        (faultCaseBo.getLevel()));
+            (faultCaseBo.getLevel()));
         queryWrapper.and(FAULT_CASE.SYMPTOMS.eq
-        (faultCaseBo.getSymptoms()));
+            (faultCaseBo.getSymptoms()));
         queryWrapper.and(FAULT_CASE.FAULT_CAUSE.eq
-        (faultCaseBo.getFaultCause()));
+            (faultCaseBo.getFaultCause()));
         queryWrapper.and(FAULT_CASE.REMARKS.eq
-        (faultCaseBo.getRemarks()));
+            (faultCaseBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -85,7 +88,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public FaultCaseVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_CASE.ID.eq(id)), FaultCaseVo.class);
+        return this.getOneAs(query().where(FAULT_CASE.ID.eq(id)), FaultCaseVo.class);
 
     }
 
@@ -99,7 +102,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     @Override
     public List<FaultCaseVo> selectList(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultCaseBo);
-            return this.listAs(queryWrapper, FaultCaseVo.class);
+        return this.listAs(queryWrapper, FaultCaseVo.class);
     }
 
     /**
@@ -111,7 +114,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     @Override
     public PageResult<FaultCaseVo> selectPage(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultCaseBo);
-            Page<FaultCaseVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultCaseVo.class);
+        Page<FaultCaseVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultCaseVo.class);
         return PageResult.build(page);
     }
 
@@ -123,7 +126,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public boolean insert(FaultCaseBo faultCaseBo) {
-    FaultCase faultCase =MapstructUtils.convert(faultCaseBo, FaultCase. class);
+        FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
 
         return this.save(faultCase);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -135,12 +138,11 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultCaseBo faultCaseBo)
-    {
+    public boolean insertWithPk(FaultCaseBo faultCaseBo) {
         FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
 
 
-            return faultCaseMapper.insertWithPk(faultCase) > 0;//前台传来主键值
+        return faultCaseMapper.insertWithPk(faultCase) > 0;//前台传来主键值
     }
 
     /**
@@ -151,10 +153,10 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public boolean update(FaultCaseBo faultCaseBo) {
-        FaultCase faultCase =MapstructUtils.convert(faultCaseBo, FaultCase. class);
-        if (ObjectUtil.isNotNull(faultCase) && ObjectUtil.isNotNull(faultCase.getId())){
+        FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
+        if (ObjectUtil.isNotNull(faultCase) && ObjectUtil.isNotNull(faultCase.getId())) {
             boolean updated = this.updateById(faultCase);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 16 - 14
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultConsumableServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultConsumableMapper;
 import org.eco.als.domain.FaultConsumable;
 import org.eco.als.domain.bo.FaultConsumableBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultConsumableVo;
 import org.eco.als.domain.vo.FaultConsumableImportVo;
 import org.eco.als.listener.FaultConsumableImportListener;
 import org.eco.als.service.IFaultConsumableService;
+
 import static org.eco.als.domain.table.FaultConsumableTableDef.FAULT_CONSUMABLE;
 
 /**
@@ -58,13 +61,13 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
     private QueryWrapper buildQueryWrapper(FaultConsumableBo faultConsumableBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_CONSUMABLE.CONSUMABLE_NAME.like
-        (faultConsumableBo.getConsumableName()));
+            (faultConsumableBo.getConsumableName()));
         queryWrapper.and(FAULT_CONSUMABLE.QUANTITY.eq
-        (faultConsumableBo.getQuantity()));
+            (faultConsumableBo.getQuantity()));
         queryWrapper.and(FAULT_CONSUMABLE.PURPOSE.eq
-        (faultConsumableBo.getPurpose()));
+            (faultConsumableBo.getPurpose()));
         queryWrapper.and(FAULT_CONSUMABLE.REMARKS.eq
-        (faultConsumableBo.getRemarks()));
+            (faultConsumableBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -77,7 +80,7 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
      */
     @Override
     public FaultConsumableVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_CONSUMABLE.ID.eq(id)), FaultConsumableVo.class);
+        return this.getOneAs(query().where(FAULT_CONSUMABLE.ID.eq(id)), FaultConsumableVo.class);
 
     }
 
@@ -91,7 +94,7 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
     @Override
     public List<FaultConsumableVo> selectList(FaultConsumableBo faultConsumableBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultConsumableBo);
-            return this.listAs(queryWrapper, FaultConsumableVo.class);
+        return this.listAs(queryWrapper, FaultConsumableVo.class);
     }
 
     /**
@@ -103,7 +106,7 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
     @Override
     public PageResult<FaultConsumableVo> selectPage(FaultConsumableBo faultConsumableBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultConsumableBo);
-            Page<FaultConsumableVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultConsumableVo.class);
+        Page<FaultConsumableVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultConsumableVo.class);
         return PageResult.build(page);
     }
 
@@ -115,7 +118,7 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
      */
     @Override
     public boolean insert(FaultConsumableBo faultConsumableBo) {
-    FaultConsumable faultConsumable =MapstructUtils.convert(faultConsumableBo, FaultConsumable. class);
+        FaultConsumable faultConsumable = MapstructUtils.convert(faultConsumableBo, FaultConsumable.class);
 
         return this.save(faultConsumable);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -127,12 +130,11 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultConsumableBo faultConsumableBo)
-    {
+    public boolean insertWithPk(FaultConsumableBo faultConsumableBo) {
         FaultConsumable faultConsumable = MapstructUtils.convert(faultConsumableBo, FaultConsumable.class);
 
 
-            return faultConsumableMapper.insertWithPk(faultConsumable) > 0;//前台传来主键值
+        return faultConsumableMapper.insertWithPk(faultConsumable) > 0;//前台传来主键值
     }
 
     /**
@@ -143,10 +145,10 @@ public class FaultConsumableServiceImpl extends BaseServiceImpl<FaultConsumableM
      */
     @Override
     public boolean update(FaultConsumableBo faultConsumableBo) {
-        FaultConsumable faultConsumable =MapstructUtils.convert(faultConsumableBo, FaultConsumable. class);
-        if (ObjectUtil.isNotNull(faultConsumable) && ObjectUtil.isNotNull(faultConsumable.getId())){
+        FaultConsumable faultConsumable = MapstructUtils.convert(faultConsumableBo, FaultConsumable.class);
+        if (ObjectUtil.isNotNull(faultConsumable) && ObjectUtil.isNotNull(faultConsumable.getId())) {
             boolean updated = this.updateById(faultConsumable);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 2 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultDiagnosisServiceImpl.java

@@ -53,8 +53,8 @@ public class FaultDiagnosisServiceImpl extends BaseServiceImpl<FaultDiagnosisMap
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_DIAGNOSIS.SORTIE_NO.eq
             (faultDiagnosisBo.getSortieNo()));
-        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_ID.eq
-            (faultDiagnosisBo.getAircraftId()));
+        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_ID.in
+            (faultDiagnosisBo.getAircraftId().split(",")));
 
         return queryWrapper;
     }

+ 18 - 16
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultEquipmentServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultEquipmentMapper;
 import org.eco.als.domain.FaultEquipment;
 import org.eco.als.domain.bo.FaultEquipmentBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultEquipmentVo;
 import org.eco.als.domain.vo.FaultEquipmentImportVo;
 import org.eco.als.listener.FaultEquipmentImportListener;
 import org.eco.als.service.IFaultEquipmentService;
+
 import static org.eco.als.domain.table.FaultEquipmentTableDef.FAULT_EQUIPMENT;
 
 /**
@@ -58,17 +61,17 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
     private QueryWrapper buildQueryWrapper(FaultEquipmentBo faultEquipmentBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_EQUIPMENT.EQUIPMENT_CODE.eq
-        (faultEquipmentBo.getEquipmentCode()));
+            (faultEquipmentBo.getEquipmentCode()));
         queryWrapper.and(FAULT_EQUIPMENT.EQUIPMENT_NAME.like
-        (faultEquipmentBo.getEquipmentName()));
+            (faultEquipmentBo.getEquipmentName()));
         queryWrapper.and(FAULT_EQUIPMENT.MODEL_NUMBER.eq
-        (faultEquipmentBo.getModelNumber()));
+            (faultEquipmentBo.getModelNumber()));
         queryWrapper.and(FAULT_EQUIPMENT.QUANTITY.eq
-        (faultEquipmentBo.getQuantity()));
+            (faultEquipmentBo.getQuantity()));
         queryWrapper.and(FAULT_EQUIPMENT.PURPOSE.eq
-        (faultEquipmentBo.getPurpose()));
+            (faultEquipmentBo.getPurpose()));
         queryWrapper.and(FAULT_EQUIPMENT.REMARKS.eq
-        (faultEquipmentBo.getRemarks()));
+            (faultEquipmentBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -81,7 +84,7 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
      */
     @Override
     public FaultEquipmentVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_EQUIPMENT.ID.eq(id)), FaultEquipmentVo.class);
+        return this.getOneAs(query().where(FAULT_EQUIPMENT.ID.eq(id)), FaultEquipmentVo.class);
 
     }
 
@@ -95,7 +98,7 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
     @Override
     public List<FaultEquipmentVo> selectList(FaultEquipmentBo faultEquipmentBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultEquipmentBo);
-            return this.listAs(queryWrapper, FaultEquipmentVo.class);
+        return this.listAs(queryWrapper, FaultEquipmentVo.class);
     }
 
     /**
@@ -107,7 +110,7 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
     @Override
     public PageResult<FaultEquipmentVo> selectPage(FaultEquipmentBo faultEquipmentBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultEquipmentBo);
-            Page<FaultEquipmentVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultEquipmentVo.class);
+        Page<FaultEquipmentVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultEquipmentVo.class);
         return PageResult.build(page);
     }
 
@@ -119,7 +122,7 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
      */
     @Override
     public boolean insert(FaultEquipmentBo faultEquipmentBo) {
-    FaultEquipment faultEquipment =MapstructUtils.convert(faultEquipmentBo, FaultEquipment. class);
+        FaultEquipment faultEquipment = MapstructUtils.convert(faultEquipmentBo, FaultEquipment.class);
 
         return this.save(faultEquipment);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -131,12 +134,11 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultEquipmentBo faultEquipmentBo)
-    {
+    public boolean insertWithPk(FaultEquipmentBo faultEquipmentBo) {
         FaultEquipment faultEquipment = MapstructUtils.convert(faultEquipmentBo, FaultEquipment.class);
 
 
-            return faultEquipmentMapper.insertWithPk(faultEquipment) > 0;//前台传来主键值
+        return faultEquipmentMapper.insertWithPk(faultEquipment) > 0;//前台传来主键值
     }
 
     /**
@@ -147,10 +149,10 @@ public class FaultEquipmentServiceImpl extends BaseServiceImpl<FaultEquipmentMap
      */
     @Override
     public boolean update(FaultEquipmentBo faultEquipmentBo) {
-        FaultEquipment faultEquipment =MapstructUtils.convert(faultEquipmentBo, FaultEquipment. class);
-        if (ObjectUtil.isNotNull(faultEquipment) && ObjectUtil.isNotNull(faultEquipment.getId())){
+        FaultEquipment faultEquipment = MapstructUtils.convert(faultEquipmentBo, FaultEquipment.class);
+        if (ObjectUtil.isNotNull(faultEquipment) && ObjectUtil.isNotNull(faultEquipment.getId())) {
             boolean updated = this.updateById(faultEquipment);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 15 - 13
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultNotesServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultNotesMapper;
 import org.eco.als.domain.FaultNotes;
 import org.eco.als.domain.bo.FaultNotesBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultNotesVo;
 import org.eco.als.domain.vo.FaultNotesImportVo;
 import org.eco.als.listener.FaultNotesImportListener;
 import org.eco.als.service.IFaultNotesService;
+
 import static org.eco.als.domain.table.FaultNotesTableDef.FAULT_NOTES;
 
 /**
@@ -58,11 +61,11 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
     private QueryWrapper buildQueryWrapper(FaultNotesBo faultNotesBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_NOTES.NOTE_CONTENT.eq
-        (faultNotesBo.getNoteContent()));
+            (faultNotesBo.getNoteContent()));
         queryWrapper.and(FAULT_NOTES.IMAGE.eq
-        (faultNotesBo.getImage()));
+            (faultNotesBo.getImage()));
         queryWrapper.and(FAULT_NOTES.REMARKS.eq
-        (faultNotesBo.getRemarks()));
+            (faultNotesBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -75,7 +78,7 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
      */
     @Override
     public FaultNotesVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_NOTES.ID.eq(id)), FaultNotesVo.class);
+        return this.getOneAs(query().where(FAULT_NOTES.ID.eq(id)), FaultNotesVo.class);
 
     }
 
@@ -89,7 +92,7 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
     @Override
     public List<FaultNotesVo> selectList(FaultNotesBo faultNotesBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultNotesBo);
-            return this.listAs(queryWrapper, FaultNotesVo.class);
+        return this.listAs(queryWrapper, FaultNotesVo.class);
     }
 
     /**
@@ -101,7 +104,7 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
     @Override
     public PageResult<FaultNotesVo> selectPage(FaultNotesBo faultNotesBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultNotesBo);
-            Page<FaultNotesVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultNotesVo.class);
+        Page<FaultNotesVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultNotesVo.class);
         return PageResult.build(page);
     }
 
@@ -113,7 +116,7 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
      */
     @Override
     public boolean insert(FaultNotesBo faultNotesBo) {
-    FaultNotes faultNotes =MapstructUtils.convert(faultNotesBo, FaultNotes. class);
+        FaultNotes faultNotes = MapstructUtils.convert(faultNotesBo, FaultNotes.class);
 
         return this.save(faultNotes);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -125,12 +128,11 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultNotesBo faultNotesBo)
-    {
+    public boolean insertWithPk(FaultNotesBo faultNotesBo) {
         FaultNotes faultNotes = MapstructUtils.convert(faultNotesBo, FaultNotes.class);
 
 
-            return faultNotesMapper.insertWithPk(faultNotes) > 0;//前台传来主键值
+        return faultNotesMapper.insertWithPk(faultNotes) > 0;//前台传来主键值
     }
 
     /**
@@ -141,10 +143,10 @@ public class FaultNotesServiceImpl extends BaseServiceImpl<FaultNotesMapper, Fau
      */
     @Override
     public boolean update(FaultNotesBo faultNotesBo) {
-        FaultNotes faultNotes =MapstructUtils.convert(faultNotesBo, FaultNotes. class);
-        if (ObjectUtil.isNotNull(faultNotes) && ObjectUtil.isNotNull(faultNotes.getId())){
+        FaultNotes faultNotes = MapstructUtils.convert(faultNotesBo, FaultNotes.class);
+        if (ObjectUtil.isNotNull(faultNotes) && ObjectUtil.isNotNull(faultNotes.getId())) {
             boolean updated = this.updateById(faultNotes);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 17 - 15
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultPersonnelServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultPersonnelMapper;
 import org.eco.als.domain.FaultPersonnel;
 import org.eco.als.domain.bo.FaultPersonnelBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultPersonnelVo;
 import org.eco.als.domain.vo.FaultPersonnelImportVo;
 import org.eco.als.listener.FaultPersonnelImportListener;
 import org.eco.als.service.IFaultPersonnelService;
+
 import static org.eco.als.domain.table.FaultPersonnelTableDef.FAULT_PERSONNEL;
 
 /**
@@ -58,15 +61,15 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
     private QueryWrapper buildQueryWrapper(FaultPersonnelBo faultPersonnelBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_PERSONNEL.PERSONNEL.eq
-        (faultPersonnelBo.getPersonnel()));
+            (faultPersonnelBo.getPersonnel()));
         queryWrapper.and(FAULT_PERSONNEL.POSITION.eq
-        (faultPersonnelBo.getPosition()));
+            (faultPersonnelBo.getPosition()));
         queryWrapper.and(FAULT_PERSONNEL.QUANTITY.eq
-        (faultPersonnelBo.getQuantity()));
+            (faultPersonnelBo.getQuantity()));
         queryWrapper.and(FAULT_PERSONNEL.DUTIES.eq
-        (faultPersonnelBo.getDuties()));
+            (faultPersonnelBo.getDuties()));
         queryWrapper.and(FAULT_PERSONNEL.REMARKS.eq
-        (faultPersonnelBo.getRemarks()));
+            (faultPersonnelBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -79,7 +82,7 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
      */
     @Override
     public FaultPersonnelVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_PERSONNEL.ID.eq(id)), FaultPersonnelVo.class);
+        return this.getOneAs(query().where(FAULT_PERSONNEL.ID.eq(id)), FaultPersonnelVo.class);
 
     }
 
@@ -93,7 +96,7 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
     @Override
     public List<FaultPersonnelVo> selectList(FaultPersonnelBo faultPersonnelBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultPersonnelBo);
-            return this.listAs(queryWrapper, FaultPersonnelVo.class);
+        return this.listAs(queryWrapper, FaultPersonnelVo.class);
     }
 
     /**
@@ -105,7 +108,7 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
     @Override
     public PageResult<FaultPersonnelVo> selectPage(FaultPersonnelBo faultPersonnelBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultPersonnelBo);
-            Page<FaultPersonnelVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultPersonnelVo.class);
+        Page<FaultPersonnelVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultPersonnelVo.class);
         return PageResult.build(page);
     }
 
@@ -117,7 +120,7 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
      */
     @Override
     public boolean insert(FaultPersonnelBo faultPersonnelBo) {
-    FaultPersonnel faultPersonnel =MapstructUtils.convert(faultPersonnelBo, FaultPersonnel. class);
+        FaultPersonnel faultPersonnel = MapstructUtils.convert(faultPersonnelBo, FaultPersonnel.class);
 
         return this.save(faultPersonnel);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -129,12 +132,11 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultPersonnelBo faultPersonnelBo)
-    {
+    public boolean insertWithPk(FaultPersonnelBo faultPersonnelBo) {
         FaultPersonnel faultPersonnel = MapstructUtils.convert(faultPersonnelBo, FaultPersonnel.class);
 
 
-            return faultPersonnelMapper.insertWithPk(faultPersonnel) > 0;//前台传来主键值
+        return faultPersonnelMapper.insertWithPk(faultPersonnel) > 0;//前台传来主键值
     }
 
     /**
@@ -145,10 +147,10 @@ public class FaultPersonnelServiceImpl extends BaseServiceImpl<FaultPersonnelMap
      */
     @Override
     public boolean update(FaultPersonnelBo faultPersonnelBo) {
-        FaultPersonnel faultPersonnel =MapstructUtils.convert(faultPersonnelBo, FaultPersonnel. class);
-        if (ObjectUtil.isNotNull(faultPersonnel) && ObjectUtil.isNotNull(faultPersonnel.getId())){
+        FaultPersonnel faultPersonnel = MapstructUtils.convert(faultPersonnelBo, FaultPersonnel.class);
+        if (ObjectUtil.isNotNull(faultPersonnel) && ObjectUtil.isNotNull(faultPersonnel.getId())) {
             boolean updated = this.updateById(faultPersonnel);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 16 - 14
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultSetpsServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultSetpsMapper;
 import org.eco.als.domain.FaultSetps;
 import org.eco.als.domain.bo.FaultSetpsBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultSetpsVo;
 import org.eco.als.domain.vo.FaultSetpsImportVo;
 import org.eco.als.listener.FaultSetpsImportListener;
 import org.eco.als.service.IFaultSetpsService;
+
 import static org.eco.als.domain.table.FaultSetpsTableDef.FAULT_SETPS;
 
 /**
@@ -58,13 +61,13 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
     private QueryWrapper buildQueryWrapper(FaultSetpsBo faultSetpsBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_SETPS.SETPS.eq
-        (faultSetpsBo.getSetps()));
+            (faultSetpsBo.getSetps()));
         queryWrapper.and(FAULT_SETPS.METHOD.eq
-        (faultSetpsBo.getMethod()));
+            (faultSetpsBo.getMethod()));
         queryWrapper.and(FAULT_SETPS.IMAGE.eq
-        (faultSetpsBo.getImage()));
+            (faultSetpsBo.getImage()));
         queryWrapper.and(FAULT_SETPS.REMARKS.eq
-        (faultSetpsBo.getRemarks()));
+            (faultSetpsBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -77,7 +80,7 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
      */
     @Override
     public FaultSetpsVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_SETPS.ID.eq(id)), FaultSetpsVo.class);
+        return this.getOneAs(query().where(FAULT_SETPS.ID.eq(id)), FaultSetpsVo.class);
 
     }
 
@@ -91,7 +94,7 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
     @Override
     public List<FaultSetpsVo> selectList(FaultSetpsBo faultSetpsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultSetpsBo);
-            return this.listAs(queryWrapper, FaultSetpsVo.class);
+        return this.listAs(queryWrapper, FaultSetpsVo.class);
     }
 
     /**
@@ -103,7 +106,7 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
     @Override
     public PageResult<FaultSetpsVo> selectPage(FaultSetpsBo faultSetpsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultSetpsBo);
-            Page<FaultSetpsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultSetpsVo.class);
+        Page<FaultSetpsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultSetpsVo.class);
         return PageResult.build(page);
     }
 
@@ -115,7 +118,7 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
      */
     @Override
     public boolean insert(FaultSetpsBo faultSetpsBo) {
-    FaultSetps faultSetps =MapstructUtils.convert(faultSetpsBo, FaultSetps. class);
+        FaultSetps faultSetps = MapstructUtils.convert(faultSetpsBo, FaultSetps.class);
 
         return this.save(faultSetps);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -127,12 +130,11 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultSetpsBo faultSetpsBo)
-    {
+    public boolean insertWithPk(FaultSetpsBo faultSetpsBo) {
         FaultSetps faultSetps = MapstructUtils.convert(faultSetpsBo, FaultSetps.class);
 
 
-            return faultSetpsMapper.insertWithPk(faultSetps) > 0;//前台传来主键值
+        return faultSetpsMapper.insertWithPk(faultSetps) > 0;//前台传来主键值
     }
 
     /**
@@ -143,10 +145,10 @@ public class FaultSetpsServiceImpl extends BaseServiceImpl<FaultSetpsMapper, Fau
      */
     @Override
     public boolean update(FaultSetpsBo faultSetpsBo) {
-        FaultSetps faultSetps =MapstructUtils.convert(faultSetpsBo, FaultSetps. class);
-        if (ObjectUtil.isNotNull(faultSetps) && ObjectUtil.isNotNull(faultSetps.getId())){
+        FaultSetps faultSetps = MapstructUtils.convert(faultSetpsBo, FaultSetps.class);
+        if (ObjectUtil.isNotNull(faultSetps) && ObjectUtil.isNotNull(faultSetps.getId())) {
             boolean updated = this.updateById(faultSetps);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 18 - 16
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultSparePartsServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.FaultSparePartsMapper;
 import org.eco.als.domain.FaultSpareParts;
 import org.eco.als.domain.bo.FaultSparePartsBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.FaultSparePartsVo;
 import org.eco.als.domain.vo.FaultSparePartsImportVo;
 import org.eco.als.listener.FaultSparePartsImportListener;
 import org.eco.als.service.IFaultSparePartsService;
+
 import static org.eco.als.domain.table.FaultSparePartsTableDef.FAULT_SPARE_PARTS;
 
 /**
@@ -58,17 +61,17 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
     private QueryWrapper buildQueryWrapper(FaultSparePartsBo faultSparePartsBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_SPARE_PARTS.SPARE_PARTS_CODE.eq
-        (faultSparePartsBo.getSparePartsCode()));
+            (faultSparePartsBo.getSparePartsCode()));
         queryWrapper.and(FAULT_SPARE_PARTS.SPARE_PARTS_NAME.like
-        (faultSparePartsBo.getSparePartsName()));
+            (faultSparePartsBo.getSparePartsName()));
         queryWrapper.and(FAULT_SPARE_PARTS.MODEL_NUMBER.eq
-        (faultSparePartsBo.getModelNumber()));
+            (faultSparePartsBo.getModelNumber()));
         queryWrapper.and(FAULT_SPARE_PARTS.QUANTITY.eq
-        (faultSparePartsBo.getQuantity()));
+            (faultSparePartsBo.getQuantity()));
         queryWrapper.and(FAULT_SPARE_PARTS.PURPOSE.eq
-        (faultSparePartsBo.getPurpose()));
+            (faultSparePartsBo.getPurpose()));
         queryWrapper.and(FAULT_SPARE_PARTS.REMARKS.eq
-        (faultSparePartsBo.getRemarks()));
+            (faultSparePartsBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -81,7 +84,7 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
      */
     @Override
     public FaultSparePartsVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_SPARE_PARTS.ID.eq(id)), FaultSparePartsVo.class);
+        return this.getOneAs(query().where(FAULT_SPARE_PARTS.ID.eq(id)), FaultSparePartsVo.class);
 
     }
 
@@ -95,7 +98,7 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
     @Override
     public List<FaultSparePartsVo> selectList(FaultSparePartsBo faultSparePartsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultSparePartsBo);
-            return this.listAs(queryWrapper, FaultSparePartsVo.class);
+        return this.listAs(queryWrapper, FaultSparePartsVo.class);
     }
 
     /**
@@ -107,7 +110,7 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
     @Override
     public PageResult<FaultSparePartsVo> selectPage(FaultSparePartsBo faultSparePartsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultSparePartsBo);
-            Page<FaultSparePartsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultSparePartsVo.class);
+        Page<FaultSparePartsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultSparePartsVo.class);
         return PageResult.build(page);
     }
 
@@ -119,7 +122,7 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
      */
     @Override
     public boolean insert(FaultSparePartsBo faultSparePartsBo) {
-    FaultSpareParts faultSpareParts =MapstructUtils.convert(faultSparePartsBo, FaultSpareParts. class);
+        FaultSpareParts faultSpareParts = MapstructUtils.convert(faultSparePartsBo, FaultSpareParts.class);
 
         return this.save(faultSpareParts);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -131,12 +134,11 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultSparePartsBo faultSparePartsBo)
-    {
+    public boolean insertWithPk(FaultSparePartsBo faultSparePartsBo) {
         FaultSpareParts faultSpareParts = MapstructUtils.convert(faultSparePartsBo, FaultSpareParts.class);
 
 
-            return faultSparePartsMapper.insertWithPk(faultSpareParts) > 0;//前台传来主键值
+        return faultSparePartsMapper.insertWithPk(faultSpareParts) > 0;//前台传来主键值
     }
 
     /**
@@ -147,10 +149,10 @@ public class FaultSparePartsServiceImpl extends BaseServiceImpl<FaultSparePartsM
      */
     @Override
     public boolean update(FaultSparePartsBo faultSparePartsBo) {
-        FaultSpareParts faultSpareParts =MapstructUtils.convert(faultSparePartsBo, FaultSpareParts. class);
-        if (ObjectUtil.isNotNull(faultSpareParts) && ObjectUtil.isNotNull(faultSpareParts.getId())){
+        FaultSpareParts faultSpareParts = MapstructUtils.convert(faultSparePartsBo, FaultSpareParts.class);
+        if (ObjectUtil.isNotNull(faultSpareParts) && ObjectUtil.isNotNull(faultSpareParts.getId())) {
             boolean updated = this.updateById(faultSpareParts);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 2 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/LifePredictionServiceImpl.java

@@ -51,8 +51,8 @@ public class LifePredictionServiceImpl extends BaseServiceImpl<LifePredictionMap
 
     private QueryWrapper buildQueryWrapper(LifePredictionBo lifePredictionBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_ID.eq
-            (lifePredictionBo.getAircraftId()));
+        queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_ID.in
+            (lifePredictionBo.getAircraftId().split(",")));
         queryWrapper.and(LIFE_PREDICTION.NAME.like
             (lifePredictionBo.getName()));
         queryWrapper.and(LIFE_PREDICTION.MODEL.eq

+ 31 - 29
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/MaintenanceServiceImpl.java

@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.MaintenanceMapper;
 import org.eco.als.domain.Maintenance;
 import org.eco.als.domain.bo.MaintenanceBo;
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.MaintenanceVo;
 import org.eco.als.domain.vo.MaintenanceImportVo;
 import org.eco.als.listener.MaintenanceImportListener;
 import org.eco.als.service.IMaintenanceService;
+
 import static org.eco.als.domain.table.MaintenanceTableDef.MAINTENANCE;
 
 /**
@@ -58,43 +61,43 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
     private QueryWrapper buildQueryWrapper(MaintenanceBo maintenanceBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(MAINTENANCE.AIRCRAFT_CODE.eq
-        (maintenanceBo.getAircraftCode()));
+            (maintenanceBo.getAircraftCode()));
         queryWrapper.and(MAINTENANCE.FAULT_CODE.eq
-        (maintenanceBo.getFaultCode()));
+            (maintenanceBo.getFaultCode()));
         queryWrapper.and(MAINTENANCE.FAULT_NAME.like
-        (maintenanceBo.getFaultName()));
+            (maintenanceBo.getFaultName()));
         queryWrapper.and(MAINTENANCE.LOCATION.eq
-        (maintenanceBo.getLocation()));
+            (maintenanceBo.getLocation()));
         queryWrapper.and(MAINTENANCE.LEVEL.eq
-        (maintenanceBo.getLevel()));
+            (maintenanceBo.getLevel()));
         queryWrapper.and(MAINTENANCE.FAULT_DATE.eq
-        (maintenanceBo.getFaultDate()));
+            (maintenanceBo.getFaultDate()));
         queryWrapper.and(MAINTENANCE.SYMPTOMS.eq
-        (maintenanceBo.getSymptoms()));
+            (maintenanceBo.getSymptoms()));
         queryWrapper.and(MAINTENANCE.FAULT_CAUSE.eq
-        (maintenanceBo.getFaultCause()));
+            (maintenanceBo.getFaultCause()));
         queryWrapper.and(MAINTENANCE.STATUS.eq
-        (maintenanceBo.getStatus()));
+            (maintenanceBo.getStatus()));
         queryWrapper.and(MAINTENANCE.SUPERVISOR.eq
-        (maintenanceBo.getSupervisor()));
+            (maintenanceBo.getSupervisor()));
         queryWrapper.and(MAINTENANCE.MAINTENANCE_TIME.eq
-        (maintenanceBo.getMaintenanceTime()));
+            (maintenanceBo.getMaintenanceTime()));
         queryWrapper.and(MAINTENANCE.BEFORE_EQUIPMENT_CODE.eq
-        (maintenanceBo.getBeforeEquipmentCode()));
+            (maintenanceBo.getBeforeEquipmentCode()));
         queryWrapper.and(MAINTENANCE.BEFORE_EQUIPMENT_NAME.like
-        (maintenanceBo.getBeforeEquipmentName()));
+            (maintenanceBo.getBeforeEquipmentName()));
         queryWrapper.and(MAINTENANCE.BEFORE_MODEL_NUMBER.eq
-        (maintenanceBo.getBeforeModelNumber()));
+            (maintenanceBo.getBeforeModelNumber()));
         queryWrapper.and(MAINTENANCE.AFTER_EQUIPMENT_CODE.eq
-        (maintenanceBo.getAfterEquipmentCode()));
+            (maintenanceBo.getAfterEquipmentCode()));
         queryWrapper.and(MAINTENANCE.AFTER_EQUIPMENT_NAME.eq
-        (maintenanceBo.getAfterEquipmentName()));
+            (maintenanceBo.getAfterEquipmentName()));
         queryWrapper.and(MAINTENANCE.AFTER_MODEL_NUMBER.eq
-        (maintenanceBo.getAfterModelNumber()));
+            (maintenanceBo.getAfterModelNumber()));
         queryWrapper.and(MAINTENANCE.QUANTITY.eq
-        (maintenanceBo.getQuantity()));
+            (maintenanceBo.getQuantity()));
         queryWrapper.and(MAINTENANCE.REMARKS.eq
-        (maintenanceBo.getRemarks()));
+            (maintenanceBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -107,7 +110,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
      */
     @Override
     public MaintenanceVo selectById(Long id) {
-            return this.getOneAs(query().where(MAINTENANCE.ID.eq(id)), MaintenanceVo.class);
+        return this.getOneAs(query().where(MAINTENANCE.ID.eq(id)), MaintenanceVo.class);
 
     }
 
@@ -121,7 +124,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
     @Override
     public List<MaintenanceVo> selectList(MaintenanceBo maintenanceBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(maintenanceBo);
-            return this.listAs(queryWrapper, MaintenanceVo.class);
+        return this.listAs(queryWrapper, MaintenanceVo.class);
     }
 
     /**
@@ -133,7 +136,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
     @Override
     public PageResult<MaintenanceVo> selectPage(MaintenanceBo maintenanceBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(maintenanceBo);
-            Page<MaintenanceVo> page = this.pageAs(PageQuery.build(), queryWrapper, MaintenanceVo.class);
+        Page<MaintenanceVo> page = this.pageAs(PageQuery.build(), queryWrapper, MaintenanceVo.class);
         return PageResult.build(page);
     }
 
@@ -145,7 +148,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
      */
     @Override
     public boolean insert(MaintenanceBo maintenanceBo) {
-    Maintenance maintenance =MapstructUtils.convert(maintenanceBo, Maintenance. class);
+        Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
 
         return this.save(maintenance);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -157,12 +160,11 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(MaintenanceBo maintenanceBo)
-    {
+    public boolean insertWithPk(MaintenanceBo maintenanceBo) {
         Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
 
 
-            return maintenanceMapper.insertWithPk(maintenance) > 0;//前台传来主键值
+        return maintenanceMapper.insertWithPk(maintenance) > 0;//前台传来主键值
     }
 
     /**
@@ -173,10 +175,10 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
      */
     @Override
     public boolean update(MaintenanceBo maintenanceBo) {
-        Maintenance maintenance =MapstructUtils.convert(maintenanceBo, Maintenance. class);
-        if (ObjectUtil.isNotNull(maintenance) && ObjectUtil.isNotNull(maintenance.getId())){
+        Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
+        if (ObjectUtil.isNotNull(maintenance) && ObjectUtil.isNotNull(maintenance.getId())) {
             boolean updated = this.updateById(maintenance);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 21 - 19
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/PartReplacementServiceImpl.java

@@ -19,7 +19,9 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
+
 import org.eco.als.mapper.PartReplacementMapper;
 import org.eco.als.domain.PartReplacement;
 import org.eco.als.domain.bo.PartReplacementBo;
@@ -27,6 +29,7 @@ import org.eco.als.domain.vo.PartReplacementVo;
 import org.eco.als.domain.vo.PartReplacementImportVo;
 import org.eco.als.listener.PartReplacementImportListener;
 import org.eco.als.service.IPartReplacementService;
+
 import static org.eco.als.domain.table.PartReplacementTableDef.PART_REPLACEMENT;
 
 /**
@@ -55,23 +58,23 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
     private QueryWrapper buildQueryWrapper(PartReplacementBo partReplacementBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(PART_REPLACEMENT.AIRCRAFT_CODE.eq
-        (partReplacementBo.getAircraftCode()));
+            (partReplacementBo.getAircraftCode()));
         queryWrapper.and(PART_REPLACEMENT.BEFORE_EQUIPMENT_CODE.eq
-        (partReplacementBo.getBeforeEquipmentCode()));
+            (partReplacementBo.getBeforeEquipmentCode()));
         queryWrapper.and(PART_REPLACEMENT.BEFORE_EQUIPMENT_NAME.like
-        (partReplacementBo.getBeforeEquipmentName()));
+            (partReplacementBo.getBeforeEquipmentName()));
         queryWrapper.and(PART_REPLACEMENT.BEFORE_MODEL_NUMBER.eq
-        (partReplacementBo.getBeforeModelNumber()));
+            (partReplacementBo.getBeforeModelNumber()));
         queryWrapper.and(PART_REPLACEMENT.AFTER_EQUIPMENT_CODE.eq
-        (partReplacementBo.getAfterEquipmentCode()));
+            (partReplacementBo.getAfterEquipmentCode()));
         queryWrapper.and(PART_REPLACEMENT.AFTER_EQUIPMENT_NAME.eq
-        (partReplacementBo.getAfterEquipmentName()));
+            (partReplacementBo.getAfterEquipmentName()));
         queryWrapper.and(PART_REPLACEMENT.AFTER_MODEL_NUMBER.eq
-        (partReplacementBo.getAfterModelNumber()));
+            (partReplacementBo.getAfterModelNumber()));
         queryWrapper.and(PART_REPLACEMENT.QUANTITY.eq
-        (partReplacementBo.getQuantity()));
+            (partReplacementBo.getQuantity()));
         queryWrapper.and(PART_REPLACEMENT.REMARKS.eq
-        (partReplacementBo.getRemarks()));
+            (partReplacementBo.getRemarks()));
 
         return queryWrapper;
     }
@@ -84,7 +87,7 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
      */
     @Override
     public PartReplacementVo selectById(Long id) {
-            return this.getOneAs(query().where(PART_REPLACEMENT.ID.eq(id)), PartReplacementVo.class);
+        return this.getOneAs(query().where(PART_REPLACEMENT.ID.eq(id)), PartReplacementVo.class);
 
     }
 
@@ -98,7 +101,7 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
     @Override
     public List<PartReplacementVo> selectList(PartReplacementBo partReplacementBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(partReplacementBo);
-            return this.listAs(queryWrapper, PartReplacementVo.class);
+        return this.listAs(queryWrapper, PartReplacementVo.class);
     }
 
     /**
@@ -110,7 +113,7 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
     @Override
     public PageResult<PartReplacementVo> selectPage(PartReplacementBo partReplacementBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(partReplacementBo);
-            Page<PartReplacementVo> page = this.pageAs(PageQuery.build(), queryWrapper, PartReplacementVo.class);
+        Page<PartReplacementVo> page = this.pageAs(PageQuery.build(), queryWrapper, PartReplacementVo.class);
         return PageResult.build(page);
     }
 
@@ -122,7 +125,7 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
      */
     @Override
     public boolean insert(PartReplacementBo partReplacementBo) {
-    PartReplacement partReplacement =MapstructUtils.convert(partReplacementBo, PartReplacement. class);
+        PartReplacement partReplacement = MapstructUtils.convert(partReplacementBo, PartReplacement.class);
 
         return this.save(partReplacement);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -134,12 +137,11 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(PartReplacementBo partReplacementBo)
-    {
+    public boolean insertWithPk(PartReplacementBo partReplacementBo) {
         PartReplacement partReplacement = MapstructUtils.convert(partReplacementBo, PartReplacement.class);
 
 
-            return partReplacementMapper.insertWithPk(partReplacement) > 0;//前台传来主键值
+        return partReplacementMapper.insertWithPk(partReplacement) > 0;//前台传来主键值
     }
 
     /**
@@ -150,10 +152,10 @@ public class PartReplacementServiceImpl extends BaseServiceImpl<PartReplacementM
      */
     @Override
     public boolean update(PartReplacementBo partReplacementBo) {
-        PartReplacement partReplacement =MapstructUtils.convert(partReplacementBo, PartReplacement. class);
-        if (ObjectUtil.isNotNull(partReplacement) && ObjectUtil.isNotNull(partReplacement.getId())){
+        PartReplacement partReplacement = MapstructUtils.convert(partReplacementBo, PartReplacement.class);
+        if (ObjectUtil.isNotNull(partReplacement) && ObjectUtil.isNotNull(partReplacement.getId())) {
             boolean updated = this.updateById(partReplacement);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 2 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/WarningServiceImpl.java

@@ -57,8 +57,8 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(WARNING.SORTIE_NO.eq
             (warningBo.getSortieNo()));
-        queryWrapper.and(WARNING.AIRCRAFT_ID.eq
-            (warningBo.getAircraftId()));
+        queryWrapper.and(WARNING.AIRCRAFT_ID.in
+            (warningBo.getAircraftId().split(",")));
         queryWrapper.and(WARNING.CODE.eq
             (warningBo.getCode()));
         queryWrapper.and(WARNING.NAME.like