装机管理新增字段

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

@@ -29,7 +29,7 @@ import java.util.List;
  * 装机信息Controller
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 @Validated
 @RequiredArgsConstructor
@@ -47,6 +47,14 @@ public class AirInstallController extends BaseController {
     public CommonResult<PageResult<AirInstallVo>> list(AirInstallBo airInstallBo) {
         return CommonResult.success(airInstallService.selectPage(airInstallBo));
     }
+    /**
+     * 查询装机信息列表All
+     */
+    @SaCheckPermission("als:airInstall:list")
+    @GetMapping("/listAll")
+    public CommonResult<List<AirInstallVo>> listAll(AirInstallBo airInstallBo) {
+        return CommonResult.success(airInstallService.selectList(airInstallBo));
+    }
 
     /**
      * 导出装机信息列表

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

@@ -5,16 +5,15 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 装机信息对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -29,6 +28,16 @@ public class AirInstall extends BaseEntity {
     @Id
     private Long id;
 
+    /**
+     * 飞机编目
+     */
+    private String airId;
+
+    /**
+     * 飞机机号
+     */
+    private String airModelId;
+
     /**
      * 构型Id
      */
@@ -105,4 +114,5 @@ public class AirInstall extends BaseEntity {
     @Column(isLogicDelete = true)
     private Integer delFlag;
 
+
 }

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

@@ -1,16 +1,19 @@
 package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.AirInstall;
 import org.eco.common.orm.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 装机信息业务对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -21,9 +24,32 @@ public class AirInstallBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 飞机编目
+     */
+    @NotBlank(message = "飞机编目不能为空")
+    private String airId;
+
+    /**
+     * 飞机编目s
+     */
+    private List<String> airIds;
+
+    /**
+     * 飞机机号
+     */
+    @NotBlank(message = "飞机机号不能为空")
+    private String airModelId;
+
+    /**
+     * 飞机机号s
+     */
+    private List<String> airModelIds;
+
     /**
      * 构型Id
      */
+    @NotBlank(message = "构型Id不能为空")
     private String configId;
 
     /**
@@ -39,6 +65,7 @@ public class AirInstallBo extends BaseEntity {
     /**
      * 器材名称
      */
+    @NotBlank(message = "器材名称不能为空")
     private String devicesName;
 
     /**

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * 装机信息导入视图对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 
 @Data
@@ -24,6 +24,18 @@ public class AirInstallImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
+    /**
+     * 飞机编目
+     */
+    @ExcelProperty(value = "飞机编目")
+    private String airId;
+
+    /**
+     * 飞机机号
+     */
+    @ExcelProperty(value = "飞机机号")
+    private String airModelId;
+
     /**
      * 构型Id
      */

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.eco.common.mapper.annotation.FieldMapper;
 import com.eco.common.mapper.constant.MapperConstant;
-import com.mybatisflex.annotation.RelationOneToOne;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,7 +17,7 @@ import java.io.Serializable;
  * 装机信息视图对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -35,14 +34,17 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "唯一ID")
     private Long id;
 
-    @RelationOneToOne(
-        selfField = "configId",
-        targetTable = "als_air_configuration_t",
-        targetField = "id",
-        valueField = "name"
-    )
-    @ExcelProperty(value = "产品名称")
-    private String configName;
+    /**
+     * 飞机编目
+     */
+    @ExcelProperty(value = "飞机编目")
+    private String airId;
+
+    /**
+     * 飞机机号
+     */
+    @ExcelProperty(value = "飞机机号")
+    private String airModelId;
 
     /**
      * 构型Id

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

@@ -15,7 +15,7 @@ import java.util.List;
  * 装机信息Service接口
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 public interface IAirInstallService extends IBaseService<AirInstall> {
     /**

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

@@ -1,5 +1,6 @@
 package org.eco.als.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -15,7 +16,6 @@ import org.eco.als.service.IAirInstallService;
 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.core.utils.StringUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.page.PageQuery;
@@ -29,14 +29,13 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.eco.als.domain.table.AirConfigurationTableDef.AIR_CONFIGURATION;
 import static org.eco.als.domain.table.AirInstallTableDef.AIR_INSTALL;
 
 /**
  * 装机信息Service业务层处理
  *
  * @author wgk
- * @date 2024-11-20
+ * @date 2024-11-21
  */
 @Service
 @Slf4j
@@ -57,10 +56,15 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
 
     private QueryWrapper buildQueryWrapper(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        if (StringUtils.isNotBlank(airInstallBo.getConfigId())) {
-            String[] airTypeIds = airInstallBo.getConfigId().split(",");
-            queryWrapper.and(AIR_INSTALL.CONFIG_ID.in(airTypeIds));
+        if(CollUtil.isNotEmpty(airInstallBo.getAirIds())) {
+            queryWrapper.and(AIR_INSTALL.AIR_ID.in(airInstallBo.getAirIds()));
         }
+        if(CollUtil.isNotEmpty(airInstallBo.getAirModelIds())) {
+            queryWrapper.and(AIR_INSTALL.AIR_MODEL_ID.in(airInstallBo.getAirModelIds()));
+        }
+        queryWrapper.and(AIR_INSTALL.AIR_ID.eq(airInstallBo.getAirId()));
+        queryWrapper.and(AIR_INSTALL.AIR_MODEL_ID.eq(airInstallBo.getAirModelId()));
+        queryWrapper.and(AIR_INSTALL.CONFIG_ID.eq(airInstallBo.getConfigId()));
         queryWrapper.and(AIR_INSTALL.DEVICES_ENCODE.eq(airInstallBo.getDevicesEncode()));
         queryWrapper.and(AIR_INSTALL.DEVICES_CODE.eq(airInstallBo.getDevicesCode()));
         queryWrapper.and(AIR_INSTALL.DEVICES_NAME.like(airInstallBo.getDevicesName()));
@@ -74,7 +78,6 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
         queryWrapper.and(AIR_INSTALL.COMPLETE_SET.eq(airInstallBo.getCompleteSet()));
         queryWrapper.and(AIR_INSTALL.SERVICE_LIFE.eq(airInstallBo.getServiceLife()));
         queryWrapper.and(AIR_INSTALL.REMARKS.eq(airInstallBo.getRemarks()));
-        queryWrapper.orderBy(AIR_INSTALL.UPDATE_TIME.desc());
 
         return queryWrapper;
     }
@@ -126,7 +129,6 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
     @Override
     public boolean insert(AirInstallBo airInstallBo) {
         AirInstall airInstall = MapstructUtils.convert(airInstallBo, AirInstall.class);
-
         return this.save(airInstall);//使用全局配置的雪花算法主键生成器生成ID值
     }