装机管理字段调整

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

@@ -1,35 +1,35 @@
 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.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.AirInstallBo;
+import org.eco.als.domain.vo.AirInstallImportVo;
+import org.eco.als.domain.vo.AirInstallVo;
+import org.eco.als.service.IAirInstallService;
 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.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.AirInstallImportVo;
-import org.eco.als.domain.vo.AirInstallVo;
-import org.eco.als.domain.bo.AirInstallBo;
-import org.eco.als.service.IAirInstallService;
+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
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 @Validated
 @RequiredArgsConstructor
@@ -47,14 +47,6 @@ public class AirInstallController extends BaseController {
     public CommonResult<PageResult<AirInstallVo>> list(AirInstallBo airInstallBo) {
         return CommonResult.success(airInstallService.selectPage(airInstallBo));
     }
-    /**
-     * 查询装机信息列表不分页select
-     */
-    @SaCheckPermission("als:airInstall:list")
-    @GetMapping("/select/list")
-    public CommonResult<List<AirInstallVo>> selectList(AirInstallBo airInstallBo) {
-        return CommonResult.success(airInstallService.selectList(airInstallBo));
-    }
 
     /**
      * 导出装机信息列表

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

@@ -1,8 +1,5 @@
 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;
 import com.mybatisflex.annotation.Table;
@@ -17,7 +14,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
  * 装机信息对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,14 +35,19 @@ public class AirInstall extends BaseEntity {
     private Long configId;
 
     /**
-     * 航材编码
+     * 器材编码
      */
-    private String materialCode;
+    private String devicesEncode;
 
     /**
-     * 航材名称
+     * 器材代码
      */
-    private String materialName;
+    private String devicesCode;
+
+    /**
+     * 器材名称
+     */
+    private String devicesName;
 
     /**
      * 规格型号
@@ -72,6 +74,11 @@ public class AirInstall extends BaseEntity {
      */
     private String installTime;
 
+    /**
+     * 软件版本
+     */
+    private String softwareVersion;
+
     /**
      * 是否可修
      */
@@ -98,25 +105,4 @@ public class AirInstall extends BaseEntity {
     @Column(isLogicDelete = true)
     private Integer delFlag;
 
-    /**
-     * 创建人
-     */
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updatedTime;
-
-
 }

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

@@ -1,21 +1,16 @@
 package org.eco.als.domain.bo;
 
-import org.eco.als.domain.AirInstall;
 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.als.domain.AirInstall;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
  * 装机信息业务对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -32,14 +27,19 @@ public class AirInstallBo extends BaseEntity {
     private Long configId;
 
     /**
-     * 航材编码
+     * 器材编码
      */
-    private String materialCode;
+    private String devicesEncode;
 
     /**
-     * 航材名称
+     * 器材代码
      */
-    private String materialName;
+    private String devicesCode;
+
+    /**
+     * 器材名称
+     */
+    private String devicesName;
 
     /**
      * 规格型号
@@ -66,6 +66,11 @@ public class AirInstallBo extends BaseEntity {
      */
     private String installTime;
 
+    /**
+     * 软件版本
+     */
+    private String softwareVersion;
+
     /**
      * 是否可修
      */
@@ -86,31 +91,5 @@ public class AirInstallBo extends BaseEntity {
      */
     private String remarks;
 
-    /**
-     * 创建人
-     */
-    @NotBlank(message = "创建人不能为空")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @NotNull(message = "创建时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @NotBlank(message = "更新人不能为空")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @NotNull(message = "更新时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date updatedTime;
-
 
 }

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

@@ -1,24 +1,18 @@
 package org.eco.als.domain.vo;
 
-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 lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import lombok.NoArgsConstructor;
-
 /**
  * 装机信息导入视图对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 
 @Data
@@ -37,16 +31,22 @@ public class AirInstallImportVo implements Serializable {
     private Long configId;
 
     /**
-     * 航材编码
+     * 器材编码
      */
-    @ExcelProperty(value = "航材编码")
-    private String materialCode;
+    @ExcelProperty(value = "器材编码")
+    private String devicesEncode;
 
     /**
-     * 航材名称
+     * 器材代码
      */
-    @ExcelProperty(value = "航材名称")
-    private String materialName;
+    @ExcelProperty(value = "器材代码")
+    private String devicesCode;
+
+    /**
+     * 器材名称
+     */
+    @ExcelProperty(value = "器材名称")
+    private String devicesName;
 
     /**
      * 规格型号
@@ -78,6 +78,12 @@ public class AirInstallImportVo implements Serializable {
     @ExcelProperty(value = "装机时间")
     private String installTime;
 
+    /**
+     * 软件版本
+     */
+    @ExcelProperty(value = "软件版本")
+    private String softwareVersion;
+
     /**
      * 是否可修
      */
@@ -108,29 +114,5 @@ public class AirInstallImportVo implements Serializable {
     @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;
-
 
 }

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

@@ -1,29 +1,23 @@
 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;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
 import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.AirInstall;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 装机信息视图对象 als_air_install_t
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -47,16 +41,22 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     private Long configId;
 
     /**
-     * 航材编码
+     * 器材编码
+     */
+    @ExcelProperty(value = "器材编码")
+    private String devicesEncode;
+
+    /**
+     * 器材代码
      */
-    @ExcelProperty(value = "航材编码")
-    private String materialCode;
+    @ExcelProperty(value = "器材代码")
+    private String devicesCode;
 
     /**
-     * 航材名称
+     * 器材名称
      */
-    @ExcelProperty(value = "航材名称")
-    private String materialName;
+    @ExcelProperty(value = "器材名称")
+    private String devicesName;
 
     /**
      * 规格型号
@@ -88,6 +88,12 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "装机时间")
     private String installTime;
 
+    /**
+     * 软件版本
+     */
+    @ExcelProperty(value = "软件版本")
+    private String softwareVersion;
+
     /**
      * 是否可修
      */
@@ -118,30 +124,6 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     @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;
-
 
     /**
      * 创建人名称

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

@@ -1,21 +1,21 @@
 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;
 import org.eco.als.domain.bo.AirInstallBo;
+import org.eco.als.domain.vo.AirInstallVo;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.IBaseService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
-import org.eco.common.core.core.page.PageResult;
+
+import java.util.List;
 
 /**
  * 装机信息Service接口
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 public interface IAirInstallService extends IBaseService<AirInstall> {
     /**

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

@@ -1,37 +1,32 @@
 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.AirInstall;
+import org.eco.als.domain.bo.AirInstallBo;
+import org.eco.als.domain.vo.AirInstallImportVo;
+import org.eco.als.domain.vo.AirInstallVo;
+import org.eco.als.listener.AirInstallImportListener;
+import org.eco.als.mapper.AirInstallMapper;
+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.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.AirInstallMapper;
-import org.eco.als.domain.AirInstall;
-import org.eco.als.domain.bo.AirInstallBo;
-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 java.util.Arrays;
+import java.util.List;
 
 import static org.eco.als.domain.table.AirInstallTableDef.AIR_INSTALL;
 
@@ -39,7 +34,7 @@ import static org.eco.als.domain.table.AirInstallTableDef.AIR_INSTALL;
  * 装机信息Service业务层处理
  *
  * @author wgk
- * @date 2024-11-15
+ * @date 2024-11-20
  */
 @Service
 @Slf4j
@@ -60,38 +55,20 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
 
     private QueryWrapper buildQueryWrapper(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(AIR_INSTALL.CONFIG_ID.eq
-            (airInstallBo.getConfigId()));
-        queryWrapper.and(AIR_INSTALL.MATERIAL_CODE.eq
-            (airInstallBo.getMaterialCode()));
-        queryWrapper.and(AIR_INSTALL.MATERIAL_NAME.like
-            (airInstallBo.getMaterialName()));
-        queryWrapper.and(AIR_INSTALL.SPECS_MODEL.eq
-            (airInstallBo.getSpecsModel()));
-        queryWrapper.and(AIR_INSTALL.DRAWING_NUMBER.eq
-            (airInstallBo.getDrawingNumber()));
-        queryWrapper.and(AIR_INSTALL.CATEGORY.eq
-            (airInstallBo.getCategory()));
-        queryWrapper.and(AIR_INSTALL.QUANTITY.eq
-            (airInstallBo.getQuantity()));
-        queryWrapper.and(AIR_INSTALL.INSTALL_TIME.eq
-            (airInstallBo.getInstallTime()));
-        queryWrapper.and(AIR_INSTALL.REPAIRABLE.eq
-            (airInstallBo.getRepairable()));
-        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.and(AIR_INSTALL.CREATED_BY.eq
-            (airInstallBo.getCreatedBy()));
-        queryWrapper.and(AIR_INSTALL.CREATED_TIME.eq
-            (airInstallBo.getCreatedTime()));
-        queryWrapper.and(AIR_INSTALL.UPDATED_BY.eq
-            (airInstallBo.getUpdatedBy()));
-        queryWrapper.and(AIR_INSTALL.UPDATED_TIME.eq
-            (airInstallBo.getUpdatedTime()));
+        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()));
+        queryWrapper.and(AIR_INSTALL.SPECS_MODEL.eq(airInstallBo.getSpecsModel()));
+        queryWrapper.and(AIR_INSTALL.DRAWING_NUMBER.eq(airInstallBo.getDrawingNumber()));
+        queryWrapper.and(AIR_INSTALL.CATEGORY.eq(airInstallBo.getCategory()));
+        queryWrapper.and(AIR_INSTALL.QUANTITY.eq(airInstallBo.getQuantity()));
+        queryWrapper.and(AIR_INSTALL.INSTALL_TIME.eq(airInstallBo.getInstallTime()));
+        queryWrapper.and(AIR_INSTALL.SOFTWARE_VERSION.eq(airInstallBo.getSoftwareVersion()));
+        queryWrapper.and(AIR_INSTALL.REPAIRABLE.eq(airInstallBo.getRepairable()));
+        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()));
 
         return queryWrapper;
     }