1.故障件编号查询故障信息

2.飞机编号查询装机信息

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

@@ -59,6 +59,14 @@ public class AirInstallController extends BaseController {
         return CommonResult.success(airInstallService.selectList(airInstallBo));
     }
 
+    /**
+     * 飞机编号查询的装机信息
+     */
+    @PostMapping("/listByAirId")
+    public CommonResult<List<AirInstallVo>> listByNo(@RequestBody AirInstallBo airInstallBo) {
+        return CommonResult.success(airInstallService.selectListByNo(airInstallBo));
+    }
+
     /**
      * 导出装机信息列表
      */

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

@@ -1,37 +1,33 @@
 package org.eco.als.controller;
 
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import cn.hutool.core.collection.CollUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import org.dromara.easyes.core.biz.EsPageInfo;
 import org.eco.als.domain.FaultCase;
-import org.eco.als.domain.vo.AirConfigurationImportVo;
-import org.eco.als.domain.vo.AirConfigurationVo;
-import org.eco.als.listener.AirConfigurationImportListener;
+import org.eco.als.domain.bo.FaultCaseBo;
+import org.eco.als.domain.vo.FaultCaseImportVo;
+import org.eco.als.domain.vo.FaultCaseVo;
 import org.eco.als.listener.FaultCaseImportListener;
-import org.eco.common.excel.core.ExcelResult;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import org.eco.als.service.IFaultCaseService;
 import org.eco.common.core.core.domain.CommonResult;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.excel.core.ExcelResult;
+import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.web.annotation.RepeatSubmit;
-import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.web.core.BaseController;
-import jakarta.annotation.Resource;
-import org.eco.als.domain.vo.FaultCaseImportVo;
-import org.eco.als.domain.vo.FaultCaseVo;
-import org.eco.als.domain.bo.FaultCaseBo;
-import org.eco.als.service.IFaultCaseService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.eco.common.core.core.page.PageResult;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 故障案例Controller
@@ -71,7 +67,7 @@ public class FaultCaseController extends BaseController {
     @SaCheckPermission("als:faultCase:export")
     @Log(title = "故障案例", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, FaultCaseBo faultCaseBo) {
+    public void export(HttpServletResponse response, @RequestBody FaultCaseBo faultCaseBo) {
         List<FaultCaseVo> list = faultCaseService.selectList(faultCaseBo);
         ExcelUtil.exportExcel(list, "飞机构型", FaultCaseVo.class, response);
     }

als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultStatisticsController.java

@@ -1,31 +1,31 @@
 package org.eco.als.controller;
 
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import cn.hutool.core.collection.CollUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.eco.als.domain.vo.*;
-import org.eco.als.listener.AirConfigurationImportListener;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.FaultStatisticsBo;
+import org.eco.als.domain.vo.FaultStatisticsImportVo;
+import org.eco.als.domain.vo.FaultStatisticsVo;
+import org.eco.als.domain.vo.FaultStatisticsWbVo;
 import org.eco.als.listener.FaultStatisticsImportListener;
-import org.eco.common.excel.core.ExcelResult;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import org.eco.als.service.IFaultStatisticsService;
 import org.eco.common.core.core.domain.CommonResult;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.excel.core.ExcelResult;
+import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.web.annotation.RepeatSubmit;
-import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.web.core.BaseController;
-import jakarta.annotation.Resource;
-import org.eco.als.domain.bo.FaultStatisticsBo;
-import org.eco.als.service.IFaultStatisticsService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-    import org.eco.common.core.core.page.PageResult;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 故障统计Controller
@@ -54,8 +54,8 @@ public class FaultStatisticsController extends BaseController {
      * 查询故障统计列表
      */
     @SaCheckPermission("als:faultStatistics:list")
-    @GetMapping("/listAll")
-    public CommonResult<List<FaultStatisticsVo>> listAll(FaultStatisticsBo faultStatisticsBo) {
+    @PostMapping("/listAll")
+    public CommonResult<List<FaultStatisticsVo>> listAll(@RequestBody FaultStatisticsBo faultStatisticsBo) {
         return CommonResult.success(faultStatisticsService.selectList(faultStatisticsBo));
     }
 

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

@@ -33,6 +33,13 @@ public interface IAirInstallService extends IBaseService<AirInstall> {
      * @return 装机信息集合
      */
     List<AirInstallVo> selectList(AirInstallBo airInstallBo);
+    /**
+     * 查询装机信息列表
+     *
+     * @param airInstallBo 装机信息Bo
+     * @return 装机信息集合
+     */
+    List<AirInstallVo> selectListByNo(AirInstallBo airInstallBo);
 
     /**
      * 分页查询装机信息列表

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

@@ -30,6 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.eco.als.domain.table.AirInstallTableDef.AIR_INSTALL;
+import static org.eco.als.domain.table.FaultStatisticsTableDef.FAULT_STATISTICS;
 
 /**
  * 装机信息Service业务层处理
@@ -109,6 +110,32 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
         return this.listAs(queryWrapper, AirInstallVo.class);
     }
 
+    /**
+     * 查询装机信息列表
+     *
+     * @param airInstallBo 装机信息Bo
+     * @return 装机信息集合
+     */
+    @Override
+    public List<AirInstallVo> selectListByNo(AirInstallBo airInstallBo) {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.select(
+                AIR_INSTALL.AIR_ID,
+                AIR_INSTALL.DEVICES_CODE,
+                AIR_INSTALL.DEVICES_NAME,
+                AIR_INSTALL.DEVICES_ENCODE,
+                AIR_INSTALL.AIR_MODEL_ID,
+                AIR_INSTALL.RATED_LIFE,
+                AIR_INSTALL.QUANTITY,
+                AIR_INSTALL.INSTALL_TIME,
+                FAULT_STATISTICS.INSTALLATION_TIME,
+                AIR_INSTALL.SERVICE_LIFE)
+            .from(AIR_INSTALL).leftJoin(FAULT_STATISTICS).on(AIR_INSTALL.DEVICES_ENCODE.eq(FAULT_STATISTICS.FAULTY_PARTS_NUM))
+            .where(
+                AIR_INSTALL.AIR_ID.eq(airInstallBo.getAirId())).orderBy(AIR_INSTALL.CREATE_TIME.desc());
+        return this.listAs(queryWrapper, AirInstallVo.class);
+    }
+
     /**
      * 分页查询装机信息列表
      *

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java

@@ -1,36 +1,34 @@
 package org.eco.als.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.FaultStatistics;
+import org.eco.als.domain.bo.FaultStatisticsBo;
+import org.eco.als.domain.vo.FaultStatisticsImportVo;
+import org.eco.als.domain.vo.FaultStatisticsVo;
 import org.eco.als.domain.vo.FaultStatisticsWbVo;
+import org.eco.als.listener.FaultStatisticsImportListener;
+import org.eco.als.mapper.FaultStatisticsMapper;
+import org.eco.als.service.IFaultStatisticsService;
 import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
-import org.eco.common.core.utils.bean.BeanUtils;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.system.service.IImportExportService;
-import org.eco.common.core.utils.StringUtils;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.common.orm.core.page.PageQuery;
-import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
+import org.eco.system.service.IImportExportService;
 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.FaultStatisticsMapper;
-import org.eco.als.domain.FaultStatistics;
-import org.eco.als.domain.bo.FaultStatisticsBo;
-import org.eco.als.domain.vo.FaultStatisticsVo;
-import org.eco.als.domain.vo.FaultStatisticsImportVo;
-import org.eco.als.listener.FaultStatisticsImportListener;
-import org.eco.als.service.IFaultStatisticsService;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.eco.als.domain.table.FaultStatisticsTableDef.FAULT_STATISTICS;
 
 /**
@@ -59,34 +57,38 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
     private QueryWrapper buildQueryWrapper(FaultStatisticsBo faultStatisticsBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_STATISTICS.STATISTICS_DATE.eq
-        (faultStatisticsBo.getStatisticsDate()));
+            (faultStatisticsBo.getStatisticsDate()));
         queryWrapper.and(FAULT_STATISTICS.WAR_ZONE.eq
-        (faultStatisticsBo.getWarZone()));
+            (faultStatisticsBo.getWarZone()));
 
         queryWrapper.and(FAULT_STATISTICS.GROUPS.eq
             (faultStatisticsBo.getGroups()));
         queryWrapper.and(FAULT_STATISTICS.MAJOR.eq
-        (faultStatisticsBo.getMajor()));
+            (faultStatisticsBo.getMajor()));
         queryWrapper.and(FAULT_STATISTICS.AIRCRAFT_MODEL.eq
             (faultStatisticsBo.getAircraftModel()));
         queryWrapper.and(FAULT_STATISTICS.AIRCRAFT_NUM.eq
             (faultStatisticsBo.getAircraftNum()));
         queryWrapper.and(FAULT_STATISTICS.FAULTY_PARTS_NAME.eq
             (faultStatisticsBo.getFaultyPartsName()));
+        queryWrapper.and(FAULT_STATISTICS.FAULTY_PARTS_NUM.eq
+            (faultStatisticsBo.getFaultyPartsNum()));
+        queryWrapper.and(FAULT_STATISTICS.FAULTY_PARTS_MODEL.eq
+            (faultStatisticsBo.getFaultyPartsModel()));
 
-        if(faultStatisticsBo.getStartStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null){
+        if (faultStatisticsBo.getStartStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null) {
             queryWrapper.between("statistics_date", faultStatisticsBo.getStartStatisticsDate(), faultStatisticsBo.getEndStatisticsDate());
         }
-        if(faultStatisticsBo.getDistinctField() != null){
-            if(faultStatisticsBo.getDistinctField().equals("groups")){
+        if (faultStatisticsBo.getDistinctField() != null) {
+            if (faultStatisticsBo.getDistinctField().equals("groups")) {
                 queryWrapper.select("DISTINCT groups"); // 指定去重字段
-            }else if(faultStatisticsBo.getDistinctField().equals("major")){
+            } else if (faultStatisticsBo.getDistinctField().equals("major")) {
                 queryWrapper.select("DISTINCT major");
-            }else if(faultStatisticsBo.getDistinctField().equals("aircraft_model")){
+            } else if (faultStatisticsBo.getDistinctField().equals("aircraft_model")) {
                 queryWrapper.select("DISTINCT aircraft_model");
-            }else if(faultStatisticsBo.getDistinctField().equals("aircraft_num")){
+            } else if (faultStatisticsBo.getDistinctField().equals("aircraft_num")) {
                 queryWrapper.select("DISTINCT aircraft_num");
-            }else if(faultStatisticsBo.getDistinctField().equals("faulty_parts_name")){
+            } else if (faultStatisticsBo.getDistinctField().equals("faulty_parts_name")) {
                 queryWrapper.select("DISTINCT faulty_parts_name");
             }
         }
@@ -108,7 +110,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
         queryWrapper.and(FAULT_STATISTICS.FAULTY_PARTS_NAME.eq
             (faultStatisticsBo.getFaultyPartsName()));
 
-        if(faultStatisticsBo.getStartStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null){
+        if (faultStatisticsBo.getStartStatisticsDate() != null && faultStatisticsBo.getEndStatisticsDate() != null) {
             queryWrapper.between("statistics_date", faultStatisticsBo.getStartStatisticsDate(), faultStatisticsBo.getEndStatisticsDate());
         }
         queryWrapper.select("faulty_parts_name,COUNT(*) as name_count").groupBy("faulty_parts_name");
@@ -124,7 +126,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
      */
     @Override
     public FaultStatisticsVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_STATISTICS.ID.eq(id)), FaultStatisticsVo.class);
+        return this.getOneAs(query().where(FAULT_STATISTICS.ID.eq(id)), FaultStatisticsVo.class);
 
     }
 
@@ -138,7 +140,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
     @Override
     public List<FaultStatisticsVo> selectList(FaultStatisticsBo faultStatisticsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultStatisticsBo);
-            return this.listAs(queryWrapper, FaultStatisticsVo.class);
+        return this.listAs(queryWrapper, FaultStatisticsVo.class);
     }
 
     /**
@@ -174,7 +176,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
     @Override
     public PageResult<FaultStatisticsVo> selectPage(FaultStatisticsBo faultStatisticsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultStatisticsBo);
-            Page<FaultStatisticsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultStatisticsVo.class);
+        Page<FaultStatisticsVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultStatisticsVo.class);
         return PageResult.build(page);
     }
 
@@ -186,7 +188,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
      */
     @Override
     public boolean insert(FaultStatisticsBo faultStatisticsBo) {
-    FaultStatistics faultStatistics =MapstructUtils.convert(faultStatisticsBo, FaultStatistics. class);
+        FaultStatistics faultStatistics = MapstructUtils.convert(faultStatisticsBo, FaultStatistics.class);
 
         return this.save(faultStatistics);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -198,12 +200,11 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultStatisticsBo faultStatisticsBo)
-    {
+    public boolean insertWithPk(FaultStatisticsBo faultStatisticsBo) {
         FaultStatistics faultStatistics = MapstructUtils.convert(faultStatisticsBo, FaultStatistics.class);
 
 
-            return faultStatisticsMapper.insertWithPk(faultStatistics) > 0;//前台传来主键值
+        return faultStatisticsMapper.insertWithPk(faultStatistics) > 0;//前台传来主键值
     }
 
     /**
@@ -214,10 +215,10 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
      */
     @Override
     public boolean update(FaultStatisticsBo faultStatisticsBo) {
-        FaultStatistics faultStatistics =MapstructUtils.convert(faultStatisticsBo, FaultStatistics. class);
-        if (ObjectUtil.isNotNull(faultStatistics) && ObjectUtil.isNotNull(faultStatistics.getId())){
+        FaultStatistics faultStatistics = MapstructUtils.convert(faultStatisticsBo, FaultStatistics.class);
+        if (ObjectUtil.isNotNull(faultStatistics) && ObjectUtil.isNotNull(faultStatistics.getId())) {
             boolean updated = this.updateById(faultStatistics);
-                return updated;
+            return updated;
         }
         return false;
     }